diff --git a/eng/Tools.props b/eng/Tools.props index 8838df202a..17afbe768f 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -3,13 +3,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45e337b17b..17e662c997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,78 +13,6 @@ https://github.com/dotnet/corefx dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - https://github.com/dotnet/corefx dd2ad4367bc4e070f3e8ca81ca6421db5733e731 @@ -93,14 +21,6 @@ https://github.com/dotnet/corefx dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - - - https://github.com/dotnet/corefx - dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - https://github.com/dotnet/standard 1063b6811691a2e009d7733cbf68f897511f00b2 @@ -135,10 +55,5 @@ https://github.com/dotnet/arcade db50c8d7378a7a81033a1b8fcfa5461694a891c3 - - https://github.com/dotnet/sourcelink - - - diff --git a/eng/Versions.props b/eng/Versions.props index 44f1669080..2f9f1df229 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,72 +19,41 @@ $(MajorVersion).$(MinorVersion) netcoreapp$(NETCoreAppFrameworkVersion) - - 1.0.0-beta.18619.4 - - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 + 5.0.0-beta.19531.14 + 5.0.0-beta.19531.14 + 5.0.0-beta.19531.14 + 5.0.0-beta.19531.14 - 2.4.1 + 2.4.1 - 2.1.0 - 3.0.0 - - 1.0.0-beta2-19367-01 + 2.1.0 + 3.0.0 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 5.0.0-alpha.1.19551.1 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 5.0.0-alpha.1.19551.1 - 2.2.0-prerelease.19551.1 + 2.2.0-prerelease.19551.1 - 5.0.0-alpha1.19525.1 - - 5.0.0-alpha1.19480.6 - - 5.0.0-alpha1.19501.4 - - 5.0.0-alpha1.19501.17 + 5.0.0-alpha1.19525.1 - 1.0.5 - 1.7.0 + 1.0.5 + 1.7.0 - 15.7.179 - $(RefOnlyMicrosoftBuildPackageVersion) - $(RefOnlyMicrosoftBuildPackageVersion) - $(RefOnlyMicrosoftBuildPackageVersion) - 4.9.4 - 4.9.4 + 15.7.179 + $(RefOnlyMicrosoftBuildVersion) + $(RefOnlyMicrosoftBuildVersion) + $(RefOnlyMicrosoftBuildVersion) + 4.9.4 + 4.9.4 @@ -92,10 +61,8 @@ Microsoft.Private.CoreFx.NETCoreApp Microsoft.NETCore.Platforms Microsoft.NETCore.Targets - NETStandard.Library + netstandard.library Microsoft.NETCore.Runtime.CoreCLR - Microsoft.Bcl.Json.Sources Microsoft.TargetingPack.Private.WinRT - Microsoft.SymbolUploader.Build.Task diff --git a/global.json b/global.json index 3660c88380..10e03c7996 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "dotnet": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19531.14", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19531.14" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19551.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19551.2" } } diff --git a/src/pkg/Directory.Build.targets b/src/pkg/Directory.Build.targets index 9e275038a9..cbe076d1e7 100644 --- a/src/pkg/Directory.Build.targets +++ b/src/pkg/Directory.Build.targets @@ -2,7 +2,7 @@ - $(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsPackageVersion)\runtime.json + $(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsVersion)\runtime.json - + diff --git a/src/pkg/projects/netstandard/src/netstandard.depproj b/src/pkg/projects/netstandard/src/netstandard.depproj index 5271c1efd2..ec841c9a3d 100644 --- a/src/pkg/projects/netstandard/src/netstandard.depproj +++ b/src/pkg/projects/netstandard/src/netstandard.depproj @@ -5,7 +5,7 @@ - + - - - - + + + +