Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

GH-310: Updated Dependencies #324

Merged
merged 4 commits into from
Jun 25, 2018
Merged

GH-310: Updated Dependencies #324

merged 4 commits into from
Jun 25, 2018

Conversation

mattleibow
Copy link
Contributor

@mattleibow mattleibow commented Jun 25, 2018

Description of Change

Updating the NuGet versions and cleaned the project files.

Bugs Fixed

API Changes

None.

Behavioral Changes

None.

PR Checklist

  • Has tests
  • Has samples
  • Rebased on top of master at time of PR
  • Changes adhere to coding standard
  • Updated documentation

@dend
Copy link
Contributor

dend commented Jun 25, 2018

❌ Validation status: errors

File Status Preview URL Details
❌Error Details

  • [Error] Cannot sync git repo to specified state. Please make sure the pull request is mergeable. Details: Git merge results in conflict, repository remote url: https://github.com/xamarin/Essentials, working directory: W:\yxxb-s, target branch: master, target branch commit: b05a266, source branch: dev/update-deps, source branch commit: .

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@mattleibow mattleibow changed the title Updated dependencies GH-310: Updated Dependencies Jun 25, 2018
@dend
Copy link
Contributor

dend commented Jun 25, 2018

✅ Validation status: passed

File Status Preview URL Details
DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj ✅Succeeded
DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj ✅Succeeded
DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj ✅Succeeded
Samples/Samples.Android/Samples.Android.csproj ✅Succeeded
Samples/Samples.UWP/Samples.UWP.csproj ✅Succeeded
Samples/Samples.iOS/Samples.iOS.csproj ✅Succeeded
Xamarin.Essentials/Xamarin.Essentials.csproj ✅Succeeded

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@mattleibow
Copy link
Contributor Author

This was an update PR, but I forgot to actually create it. This PR now just cleans up the .csproj, removing the multiple <ItemGroup>s and orders/groups the items correctly

@@ -51,7 +51,7 @@
<Compile Include="**\*.netstandard.*.cs" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to bump to this? I assume it is okay? will it align with templates and does it require specific versions of .NET Core to be installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not related to .net core (MS just used that name for some reason). This is the new version in the templates: https://github.com/xamarin/xamarin-templates/search?q=UniversalWindowsPlatform&unscoped_q=UniversalWindowsPlatform

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should just sync with @pierceboggan to make sure our templates use this version too.

@dend
Copy link
Contributor

dend commented Jun 25, 2018

✅ Validation status: passed

File Status Preview URL Details
DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj ✅Succeeded
DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj ✅Succeeded
DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj ✅Succeeded
Samples/Samples.Android/Samples.Android.csproj ✅Succeeded
Samples/Samples.UWP/Samples.UWP.csproj ✅Succeeded
Samples/Samples.iOS/Samples.iOS.csproj ✅Succeeded
Xamarin.Essentials/Xamarin.Essentials.csproj ✅Succeeded

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@dend
Copy link
Contributor

dend commented Jun 25, 2018

✅ Validation status: passed

File Status Preview URL Details
DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj ✅Succeeded
DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj ✅Succeeded
DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj ✅Succeeded
Samples/Samples.Android/Samples.Android.csproj ✅Succeeded
Samples/Samples.UWP/Samples.UWP.csproj ✅Succeeded
Samples/Samples.iOS/Samples.iOS.csproj ✅Succeeded
Xamarin.Essentials/Xamarin.Essentials.csproj ✅Succeeded

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

@Redth Redth merged commit 5e6b038 into master Jun 25, 2018
@Redth Redth deleted the dev/update-deps branch June 25, 2018 20:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants