diff --git a/dir.props b/dir.props index 1e3335799b..d5ace26e73 100644 --- a/dir.props +++ b/dir.props @@ -10,7 +10,7 @@ true false true - false + true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bdf1cc1c3..0b2905f28c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,52 +27,52 @@ 1127689f262d52ea8ff68ef03d706fa62b3b40a1 linker - + https://github.com/dotnet/coreclr - aed84886b8d777168f53fae4da15c7af5f7572da + 922429db0144dd6f3b4324805464dae82857512a - + https://github.com/dotnet/standard - 209c43e7f6232e7871b6927a510c25ee7dfd5c72 + a5b5f2e1e369972c8ff1e2183979fab6099f52ef - + https://github.com/dotnet/corefx - 3da667af759d88b683ca851694ced073e8dc9960 + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/aspnet/AspNetCore-Tooling - d8f651aa5281e9fa60a8fe0dcad98efeb7720a36 + 16b0ca4a5838c39c8852e6cf144232597e2bee2e aspnetcore-tooling - + https://github.com/dotnet/templating - e8d6da33000a416b2b36b4f04b1756dcc99f671d + b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/roslyn - 3b423bd305daf81076d4d7b105101361c2490531 + 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - - https://github.com/Microsoft/msbuild - 4a2d771074b97bcc31125801b4a9ea57900d84d6 + + https://github.com/microsoft/msbuild + 0f4c62feac0a5726f63b56472de7b1c1527459fc - + https://github.com/NuGet/NuGet.Client - bb60d6720d24890b8f3e071e70d27ea0f2bef57e + b75150f2f4127a77a166c9552845e86fb24a3282 nuget-client - + https://github.com/aspnet/Extensions - 73c259904d5db01bbeede15df2a72d1b94cb3306 + 0b951c16de0f39e13cce8372e11c28eb90576662 aspnet-extensions - + https://github.com/dotnet/sdk - b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5 + b3a343bf8ed65f5208c5bb86c632856c5d107b1d https://github.com/dotnet/cliCommandLineParser @@ -89,34 +89,34 @@ https://github.com/dotnet/xliff-tasks 173ee3bd61c9549557eefa3cfb718bdef157cb87 - + https://github.com/aspnet/AspNetCore - 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad + aee5e4080331553ea9dfb7fb388b6d72f715bf6a aspnetcore - + https://github.com/dotnet/cli - 70cf7521b833e92afe13864c775399a2e6922176 + e72d84f73adcbfa0054df27fbb21505295a55dcb https://github.com/dotnet/fsharp 0422ff293bb2cc722fe5021b85ef50378a9af823 - + https://github.com/aspnet/websdk - 0141a0efbdad0ece12294cec1f6da1c03502e021 + 002ea5ca7c699d925281abd8307556ec8eccb530 - + https://github.com/microsoft/vstest - 2479b26734a98a9594590ee13e895aa58b5f0a6b + 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/dotnet/toolset - 8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03 + 33026f95de81116aefd79b4ec4c8071090a02480 - + https://github.com/dotnet/core-sdk - c4d43f672d8c1bca944a2177d517223028629f54 + 04339c3a262a2e313f9431edd3805ce71e08b92e diff --git a/patches/arcade/0002-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch b/patches/arcade/0003-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch similarity index 91% rename from patches/arcade/0002-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch rename to patches/arcade/0003-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch index 3679f4b737..7eee0dd0de 100644 --- a/patches/arcade/0002-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch +++ b/patches/arcade/0003-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch @@ -1,7 +1,7 @@ -From b85de43a04b54a267ac4fa8dd70047b35e482676 Mon Sep 17 00:00:00 2001 +From 64a346d373e2cf6c99182fdd4a8e6a77e4866fd1 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 29 Aug 2019 11:20:06 -0500 -Subject: [PATCH 2/2] Remove adding fake dependencies for CoreFX partial +Subject: [PATCH 3/4] Remove adding fake dependencies for CoreFX partial packages. --- @@ -27,5 +27,5 @@ index a3a0bd85..06d45eff 100644 -- -2.18.0 +2.21.0 diff --git a/patches/arcade/0004-Changing-GetLastStablePackage-logic-in-order-to-allo.patch b/patches/arcade/0004-Changing-GetLastStablePackage-logic-in-order-to-allo.patch new file mode 100644 index 0000000000..e20d276b98 --- /dev/null +++ b/patches/arcade/0004-Changing-GetLastStablePackage-logic-in-order-to-allo.patch @@ -0,0 +1,233 @@ +From 1a46808cbcfe7e2f1dd623fb04d3be2899374808 Mon Sep 17 00:00:00 2001 +From: Jose Perez Rodriguez +Date: Fri, 23 Aug 2019 08:55:57 -0700 +Subject: [PATCH 4/4] Changing GetLastStablePackage logic in order to allow + excluding same era packages (#3717) + +* Changing GetLastStablePackage logic in order to allow excluding same era packages + +* Address PR feedback + +* More PR Feedback +--- + .../src/GetLastStablePackage.cs | 15 +++- + .../src/VersionUtility.cs | 19 +++++ + .../src/build/Packaging.targets | 13 +++- + .../tests/GetLastStablePackageTests.cs | 74 +++++++++++++++++++ + 4 files changed, 114 insertions(+), 7 deletions(-) + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetLastStablePackage.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetLastStablePackage.cs +index e467614a..c15c1ae3 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetLastStablePackage.cs ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetLastStablePackage.cs +@@ -1,9 +1,10 @@ +-using Microsoft.Build.Framework; ++using Microsoft.Build.Framework; + using Microsoft.Build.Utilities; + using NuGet.Versioning; + using System; + using System.Collections.Generic; + using System.Linq; ++using System.Runtime.CompilerServices; + using System.Text; + using System.Threading.Tasks; + +@@ -31,7 +32,14 @@ public class GetLastStablePackage : BuildTask + /// Package index files used to define stable packages. + /// + public ITaskItem[] PackageIndexes { get; set; } ++ ++ /// ++ /// if the result version can be a version from the same release. ++ /// otherwise. Defaults to false. ++ /// ++ public bool DoNotAllowVersionsFromSameRelease { get; set; } + ++ + /// + /// Latest version from StablePackages for all packages in LatestPackages. + /// If a version isn't found for an item in LatestPackage that will not be included in this set. +@@ -131,13 +139,12 @@ public void GetLastStablePackagesFromIndex() + Log.LogMessage($"Could not parse version {versionString} for LatestPackage {packageId}, will use latest stable."); + } + +- var latestVersion = nuGetVersion?.Version; ++ var latestVersion = (DoNotAllowVersionsFromSameRelease) ? VersionUtility.As2PartVersion(nuGetVersion?.Version) : nuGetVersion?.Version; + + PackageInfo info; + if (index.Packages.TryGetValue(packageId, out info)) + { +- var candidateVersions = (latestVersion == null) ? info.StableVersions : info.StableVersions.Where(sv => VersionUtility.As4PartVersion(sv) < latestVersion); +- ++ IEnumerable candidateVersions = (latestVersion == null) ? info.StableVersions : info.StableVersions.Where(sv => VersionUtility.As4PartVersion(sv) < latestVersion); + if (candidateVersions.Any()) + { + lastStablePackages.Add(CreateItem(latestPackage, candidateVersions.Max())); +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VersionUtility.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VersionUtility.cs +index 4432c1b3..a655295c 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VersionUtility.cs ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VersionUtility.cs +@@ -57,6 +57,9 @@ public static Version GetAssemblyVersion(Stream assemblyStream) + + public static Version As3PartVersion(Version version) + { ++ if (version == null) ++ return null; ++ + int build = version.Build; + + if (build == -1) +@@ -73,8 +76,24 @@ public static Version As3PartVersion(Version version) + return new Version(version.Major, version.Minor, build); + } + ++ public static Version As2PartVersion(Version version) ++ { ++ if (version == null) ++ return null; ++ ++ if (version.Build == -1) ++ { ++ // we already have a 2-part version ++ return version; ++ } ++ return new Version(version.Major, version.Minor); ++ } ++ + public static Version As4PartVersion(Version version) + { ++ if (version == null) ++ return null; ++ + int build = version.Build, revision = version.Revision; + + if (build == -1) +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +index 06d45eff..156dbcd3 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +@@ -380,11 +380,16 @@ + <_latestRuntimePackages Include="@(PkgProjDependency)" Condition="'%(PkgProjDependency.TargetRuntime)' != ''" KeepDuplicates="false" /> + + ++ ++ true ++ ++ + + ++ PackageIndexes="@(PackageIndex)" ++ DoNotAllowVersionsFromSameRelease="$(DoNotAllowVersionsFromSameRelease)"> + + + +@@ -396,14 +401,16 @@ + ++ PackageIndexes="@(PackageIndex)" ++ DoNotAllowVersionsFromSameRelease="$(DoNotAllowVersionsFromSameRelease)"> + + + + ++ PackageIndexes="@(PackageIndex)" ++ DoNotAllowVersionsFromSameRelease="$(DoNotAllowVersionsFromSameRelease)"> + + + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/GetLastStablePackageTests.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/GetLastStablePackageTests.cs +index aea43be5..3c818239 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/GetLastStablePackageTests.cs ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/GetLastStablePackageTests.cs +@@ -117,6 +117,80 @@ public void PriorToStableGetsNothing() + Assert.Equal(0, task.LastStablePackages.Length); + } + ++ [Fact] ++ public void DoNotAllowSameReleasePackageVersions() ++ { ++ ITaskItem[] latestPackages = new[] ++ { ++ CreateItem("StableVersionTest", "1.1.1-pre") ++ }; ++ ++ GetLastStablePackage task = new GetLastStablePackage() ++ { ++ BuildEngine = _engine, ++ PackageIndexes = _packageIndexes, ++ LatestPackages = latestPackages, ++ DoNotAllowVersionsFromSameRelease = true ++ }; ++ ++ _log.Reset(); ++ task.Execute(); ++ Assert.Equal(0, _log.ErrorsLogged); ++ Assert.Equal(0, _log.WarningsLogged); ++ Assert.Equal(task.LatestPackages.Length, task.LastStablePackages.Length); ++ Assert.Equal("StableVersionTest", task.LastStablePackages[0].ItemSpec); ++ Assert.Equal("1.0.0", task.LastStablePackages[0].GetMetadata("Version")); ++ } ++ ++ [Fact] ++ public void NullVersionShouldUseLatestStableVersion() ++ { ++ ITaskItem[] latestPackages = new[] ++ { ++ CreateItem("StableVersionTest", null) ++ }; ++ ++ GetLastStablePackage task = new GetLastStablePackage() ++ { ++ BuildEngine = _engine, ++ PackageIndexes = _packageIndexes, ++ LatestPackages = latestPackages, ++ DoNotAllowVersionsFromSameRelease = true ++ }; ++ ++ _log.Reset(); ++ task.Execute(); ++ Assert.Equal(0, _log.ErrorsLogged); ++ Assert.Equal(0, _log.WarningsLogged); ++ Assert.Equal(task.LatestPackages.Length, task.LastStablePackages.Length); ++ Assert.Equal("StableVersionTest", task.LastStablePackages[0].ItemSpec); ++ Assert.Equal("1.1.0", task.LastStablePackages[0].GetMetadata("Version")); ++ } ++ ++ [Fact] ++ public void AllowSameReleasePackageVersions() ++ { ++ ITaskItem[] latestPackages = new[] ++ { ++ CreateItem("StableVersionTest", "1.1.1-pre") ++ }; ++ ++ GetLastStablePackage task = new GetLastStablePackage() ++ { ++ BuildEngine = _engine, ++ PackageIndexes = _packageIndexes, ++ LatestPackages = latestPackages ++ }; ++ ++ _log.Reset(); ++ task.Execute(); ++ Assert.Equal(0, _log.ErrorsLogged); ++ Assert.Equal(0, _log.WarningsLogged); ++ Assert.Equal(task.LatestPackages.Length, task.LastStablePackages.Length); ++ Assert.Equal("StableVersionTest", task.LastStablePackages[0].ItemSpec); ++ Assert.Equal("1.1.0", task.LastStablePackages[0].GetMetadata("Version")); ++ } ++ + private static ITaskItem CreateItem(string name, string version) + { + TaskItem item = new TaskItem(name); +-- +2.21.0 + diff --git a/patches/arcade/0005-Fix-packaging-targets-3857.patch b/patches/arcade/0005-Fix-packaging-targets-3857.patch new file mode 100644 index 0000000000..7741899da0 --- /dev/null +++ b/patches/arcade/0005-Fix-packaging-targets-3857.patch @@ -0,0 +1,100 @@ +From 8591e57263d5ede7391c4c74ada6b950e0d7b3f2 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Fri, 6 Sep 2019 07:44:24 -0700 +Subject: [PATCH 5/5] Fix packaging targets (#3857) + +* Add a test for final version kind == release for packaging targets +--- + .../MinimalRepoTests.cs | 16 ++++++++++++++-- + .../RepoWithConditionalProjectsToBuildTests.cs | 12 ++++++++---- + .../src/build/Packaging.targets | 4 ++-- + 3 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/MinimalRepoTests.cs b/src/Microsoft.DotNet.Arcade.Sdk.Tests/MinimalRepoTests.cs +index 50db0ced..8c7d9ba8 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/MinimalRepoTests.cs ++++ b/src/Microsoft.DotNet.Arcade.Sdk.Tests/MinimalRepoTests.cs +@@ -23,11 +23,23 @@ public MinimalRepoTests(ITestOutputHelper output, TestProjectFixture fixture) + public void MinimalRepoBuildsWithoutErrors() + { + var app = _fixture.CreateTestApp("MinimalRepo"); +- var exitCode = app.ExecuteBuild(_output, ++ var exitCode = app.ExecuteBuild(_output, + // these properties are required for projects that are not in a git repo +- "/p:EnableSourceLink=false", ++ "/p:EnableSourceLink=false", + "/p:EnableSourceControlManagerQueries=false"); + Assert.Equal(0, exitCode); + } ++ ++ [Fact] ++ public void MinimalRepoWithFinalVersions() ++ { ++ var app = _fixture.CreateTestApp("MinimalRepo"); ++ var exitCode = app.ExecuteBuild(_output, ++ // these properties are required for projects that are not in a git repo ++ "/p:EnableSourceLink=false", ++ "/p:EnableSourceControlManagerQueries=false", ++ "/p:DotNetFinalVersionKind=release"); ++ Assert.Equal(0, exitCode); ++ } + } + } +diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/RepoWithConditionalProjectsToBuildTests.cs b/src/Microsoft.DotNet.Arcade.Sdk.Tests/RepoWithConditionalProjectsToBuildTests.cs +index 345520bd..eab61085 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/RepoWithConditionalProjectsToBuildTests.cs ++++ b/src/Microsoft.DotNet.Arcade.Sdk.Tests/RepoWithConditionalProjectsToBuildTests.cs +@@ -23,20 +23,24 @@ public RepoWithConditionalProjectsToBuildTests(ITestOutputHelper output, TestPro + } + + [Theory] +- [InlineData(false, 1)] +- [InlineData(true, 2)] +- public void RepoProducesPackages(bool buildAdditionalProject, int expectedPackages) ++ [InlineData(false, 1, false)] ++ [InlineData(false, 1, true)] ++ [InlineData(true, 2, false)] ++ [InlineData(true, 2, true)] ++ public void RepoProducesPackages(bool buildAdditionalProject, int expectedPackages, bool stablePackages) + { + var app = _fixture.CreateTestApp("RepoWithConditionalProjectsToBuild"); + var packArg = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) + ? "-pack" + : "--pack"; ++ var finalVersionKindarg = stablePackages ? "/p:DotNetFinalVersionKind=release" : "/p:DotNetFinalVersionKind=prerelease"; + var exitCode = app.ExecuteBuild(_output, + packArg, + $"/p:ShouldBuildMaybe={buildAdditionalProject}", + // these properties are required for projects that are not in a git repo + "/p:EnableSourceLink=false", +- "/p:EnableSourceControlManagerQueries=false"); ++ "/p:EnableSourceControlManagerQueries=false", ++ finalVersionKindarg); + Assert.Equal(0, exitCode); + var nupkgFiles = Directory.GetFiles(Path.Combine(app.WorkingDirectory, "artifacts", "packages", "Debug", "Shipping"), "*.nupkg"); + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +index 156dbcd3..1dad25df 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +@@ -734,7 +734,7 @@ + + + ++ Condition="'$(VersionSuffix)' == '' AND '@(_BaseLinedDependencies)' != ''" /> + + + + ++ Condition="'$(VersionSuffix)' == '' AND '$(StableVersion)' == ''" /> + + +-- +2.18.0 + diff --git a/patches/arcade/0006-Allow-VersionPrefix-to-include-an-optionally-provide.patch b/patches/arcade/0006-Allow-VersionPrefix-to-include-an-optionally-provide.patch new file mode 100644 index 0000000000..8a3bc0b1fe --- /dev/null +++ b/patches/arcade/0006-Allow-VersionPrefix-to-include-an-optionally-provide.patch @@ -0,0 +1,35 @@ +From 57e91080f345bbedde5e29e400e0bb668edbda21 Mon Sep 17 00:00:00 2001 +From: Joey Robichaud +Date: Wed, 7 Aug 2019 16:52:05 -0700 +Subject: [PATCH 06/11] Allow VersionPrefix to include an optionally provided + PatchVersion (#3601) + +* Allow VersionPrefix to include an optionally provided PatchVersion + +* Simplify optionally using a PatchVersion in VersionPrefix + +* Fix closing tag +--- + .../tools/Version.BeforeCommonTargets.targets | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +index 345dc6b5..970219c3 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +@@ -49,10 +49,10 @@ + + + +- $(MajorVersion).$(MinorVersion).0 ++ $(MajorVersion).$(MinorVersion).$(MSBuild::ValueOrDefault('$(PatchVersion)', '0')) + <_OriginalVersionPrefix>$(VersionPrefix) + + +-- +2.18.0 + diff --git a/patches/arcade/0007-Fix-missing-in-MSBuild-function-call-to-calculate-Ve.patch b/patches/arcade/0007-Fix-missing-in-MSBuild-function-call-to-calculate-Ve.patch new file mode 100644 index 0000000000..135087a6ae --- /dev/null +++ b/patches/arcade/0007-Fix-missing-in-MSBuild-function-call-to-calculate-Ve.patch @@ -0,0 +1,26 @@ +From c86c14dcee905b82286df40806f36448f4a1aa5d Mon Sep 17 00:00:00 2001 +From: Santiago Fernandez Madero +Date: Thu, 8 Aug 2019 11:34:24 -0700 +Subject: [PATCH 07/11] Fix missing [] in MSBuild function call to calculate + Version Prefix (#3622) + +--- + .../tools/Version.BeforeCommonTargets.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +index 970219c3..329d6b19 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +@@ -52,7 +52,7 @@ + Note that .NET Core SDK sets VersionPrefix to 1.0.0 if not set by the project. Override it here if the project sets MajorVersion, MinorVersion, and optionally a PatchVersion. + --> + +- $(MajorVersion).$(MinorVersion).$(MSBuild::ValueOrDefault('$(PatchVersion)', '0')) ++ $(MajorVersion).$(MinorVersion).$([MSBuild]::ValueOrDefault('$(PatchVersion)', '0')) + <_OriginalVersionPrefix>$(VersionPrefix) + + +-- +2.18.0 + diff --git a/patches/arcade/0008-Produce-a-non-stable-version-if-package-is-non-shipp.patch b/patches/arcade/0008-Produce-a-non-stable-version-if-package-is-non-shipp.patch new file mode 100644 index 0000000000..3906253204 --- /dev/null +++ b/patches/arcade/0008-Produce-a-non-stable-version-if-package-is-non-shipp.patch @@ -0,0 +1,93 @@ +From 8356bbfcf1884dec6339ac7470b63e1be3195c25 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Fri, 6 Sep 2019 07:47:40 -0700 +Subject: [PATCH 08/11] Produce a non-stable version if package is non-shipping + (#3875) + +If a package is non-shipping (IsShipping=false). We should always produce a non-stabilized version. This was missed in the current versioning implementation +--- + .../tools/Version.BeforeCommonTargets.targets | 23 +++++++++++-------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +index 329d6b19..07f8004a 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +@@ -4,15 +4,15 @@ + + + +- + +@@ -38,7 +38,7 @@ + + $(_BuildNumberR) + $(VersionSuffixBuildOfTheDay.PadLeft(2, $([System.Convert]::ToChar(`0`)))) +- ++ + + <_PatchNumber>$([MSBuild]::Add($([MSBuild]::Multiply($([MSBuild]::Subtract($(VersionSuffixDateStamp), $([MSBuild]::ValueOrDefault($(VersionBaseShortDate), 19000)))), 100)), $(_BuildNumberR))) + +@@ -57,8 +57,8 @@ + + + + +@@ -78,7 +78,7 @@ + + <_BuildNumberLabels Condition="'$(VersionSuffixDateStamp)' != '' and '$(SemanticVersioningV1)' != 'true'">.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) + <_BuildNumberLabels Condition="'$(VersionSuffixDateStamp)' != '' and '$(SemanticVersioningV1)' == 'true'">-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded) +- ++ + + $(_PreReleaseLabel)$(_BuildNumberLabels) + ++ ++ $(_PreReleaseLabel)$(_BuildNumberLabels) ++ + +-- +2.18.0 + diff --git a/patches/arcade/0009-Switch-IsShipping-IsShippingPackage-3909.patch b/patches/arcade/0009-Switch-IsShipping-IsShippingPackage-3909.patch new file mode 100644 index 0000000000..805c128750 --- /dev/null +++ b/patches/arcade/0009-Switch-IsShipping-IsShippingPackage-3909.patch @@ -0,0 +1,27 @@ +From b044352ea4607bf33e6699b34a71f6f83708f694 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Mon, 9 Sep 2019 15:43:45 -0700 +Subject: [PATCH 09/11] Switch IsShipping -> IsShippingPackage (#3909) + +It was brought up that IsShippingPackage is more correct here (IsShipping sets IsShippingPackage for packages). +Also invert the conditional to be more in line with the convention. +--- + .../tools/Version.BeforeCommonTargets.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +index 07f8004a..0808c222 100644 +--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets ++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets +@@ -101,7 +101,7 @@ + +- $(_PreReleaseLabel)$(_BuildNumberLabels) ++ $(_PreReleaseLabel)$(_BuildNumberLabels) + + +- true +- +- $(IsShipping) +- false +- $(IsShipping) +- $(IsShipping) +- + + + ++ ++ ++ true ++ ++ $(IsShipping) ++ false ++ $(IsShipping) ++ $(IsShipping) ++ ++ + +@@ -1299,7 +1304,12 @@ + + + +- ++ ++ ++ ++ ++ ++ + ++ InboxFrameworkLayoutFolders="@(FrameworkLayout)" ++ UpdateStablePackageInfo="$(UpdateStablePackageInfo)" /> + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch b/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch index e5c0c3e433..7400171209 100644 --- a/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch +++ b/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch @@ -1,17 +1,17 @@ -From 3dc531927c9541ca7e164fb647537fde5ce92f3c Mon Sep 17 00:00:00 2001 +From b8b37759db44435cd4f4b2b0e3656c5550c323d7 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 26 Jul 2019 13:37:36 -0500 -Subject: [PATCH 1/5] Exclude analyzer for source-build. +Subject: [PATCH 1/6] Exclude analyzer for source-build. --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 06e288aa81..6c07ec1582 100644 +index 66e5b316b1..141506a2b5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -87,7 +87,7 @@ +@@ -96,7 +96,7 @@ $(RuntimeInstallerBaseName)-internal @@ -21,5 +21,5 @@ index 06e288aa81..6c07ec1582 100644 -- -2.18.0 +2.21.0 diff --git a/patches/aspnetcore/0002-Import-PackageVersions.props.patch b/patches/aspnetcore/0002-Import-PackageVersions.props.patch index 00e9c35f6b..ee6d42985e 100644 --- a/patches/aspnetcore/0002-Import-PackageVersions.props.patch +++ b/patches/aspnetcore/0002-Import-PackageVersions.props.patch @@ -1,19 +1,19 @@ -From e017c731bb17682c88ce7344da5d2e3226a4ec0b Mon Sep 17 00:00:00 2001 +From 90b06d9976a743a929ab935684abf5881968693a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 17 Jul 2019 17:20:48 -0500 -Subject: [PATCH 2/5] Import PackageVersions.props. +Subject: [PATCH 2/6] Import PackageVersions.props. --- eng/Versions.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props -index 9508549dc3..58290f50bd 100644 +index 023598352f..243234628a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -253,6 +253,9 @@ +@@ -264,6 +264,9 @@ $(XunitVersion) - 1.0.19239.1 + 1.0.19249.1 + + @@ -22,5 +22,5 @@ index 9508549dc3..58290f50bd 100644 -- -2.18.0 +2.21.0 diff --git a/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch index a1afd2cbc2..c09bd0dcfe 100644 --- a/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch +++ b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch @@ -1,14 +1,14 @@ -From c6e67b57180f9d2eb27259ef40cca5ed8b74e8f3 Mon Sep 17 00:00:00 2001 +From 13be14b9e411efee0425eb2d8d53e85a335c8a6a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 18 Jul 2019 01:34:30 -0500 -Subject: [PATCH 3/5] Exclude some projects from source-build. +Subject: [PATCH 3/6] Exclude some projects from source-build. --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props -index 6c07ec1582..443f4b2797 100644 +index 141506a2b5..456bcafb06 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,9 +18,11 @@ @@ -20,9 +20,9 @@ index 6c07ec1582..443f4b2797 100644 true false + true - - + +- $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) ++ 3.0.0 + + + +-- +2.18.0 + diff --git a/patches/core-sdk/0005-Don-t-call-dotnet-without-path.patch b/patches/core-sdk/0005-Don-t-call-dotnet-without-path.patch new file mode 100644 index 0000000000..b124d1d4a9 --- /dev/null +++ b/patches/core-sdk/0005-Don-t-call-dotnet-without-path.patch @@ -0,0 +1,29 @@ +From 5cac047720ee941bed0d62faf24f134cc98fcd91 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 26 Sep 2019 07:44:26 -0500 +Subject: [PATCH 5/5] Don't call dotnet without path + +--- + eng/common/tools.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 757d5b9ea..a8fabf54b 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -338,12 +338,6 @@ function MSBuild { + InitializeBuildTool + InitializeToolset + +- # Work around issues with Azure Artifacts credential provider +- # https://github.com/dotnet/arcade/issues/3932 +- if [[ "$ci" == true ]]; then +- dotnet nuget locals http-cache -c +- fi +- + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) +-- +2.18.0 + diff --git a/patches/corefx/0003-Check-in-package-baseline-so-all-build-nodes-see-the.patch b/patches/corefx/0003-Check-in-package-baseline-so-all-build-nodes-see-the.patch new file mode 100644 index 0000000000..50cccf4be6 --- /dev/null +++ b/patches/corefx/0003-Check-in-package-baseline-so-all-build-nodes-see-the.patch @@ -0,0 +1,779 @@ +From 4ca751a153e65c24b75eec53b50053583f205ed8 Mon Sep 17 00:00:00 2001 +From: Anipik +Date: Tue, 24 Sep 2019 17:16:31 -0700 +Subject: [PATCH] update package index + +--- + .../packageIndex.json | 236 +++++++++++++----- + 1 file changed, 168 insertions(+), 68 deletions(-) + +diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +index 00b85cf23d..a6fd2190c3 100644 +--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json ++++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +@@ -21,6 +21,9 @@ + } + }, + "Microsoft.Bcl.AsyncInterfaces": { ++ "StableVersions": [ ++ "1.0.0" ++ ], + "BaselineVersion": "1.0.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -28,6 +31,9 @@ + } + }, + "Microsoft.Bcl.HashCode": { ++ "StableVersions": [ ++ "1.0.0" ++ ], + "BaselineVersion": "1.0.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -74,7 +80,8 @@ + "4.3.0", + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -126,7 +133,8 @@ + "1.1.26", + "1.1.28", + "2.0.0", +- "2.0.1" ++ "2.0.1", ++ "2.1.0" + ], + "BaselineVersion": "2.1.0", + "InboxOn": {}, +@@ -137,6 +145,9 @@ + } + }, + "Microsoft.IO.Redist": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -167,11 +178,18 @@ + "2.1.5", + "2.2.0", + "2.2.1", +- "2.2.2" ++ "2.2.2", ++ "3.0.0" + ], + "BaselineVersion": "3.0.0", + "InboxOn": {} + }, ++ "Microsoft.NETCore.Platforms.Future": { ++ "StableVersions": [ ++ "3.0.0" ++ ], ++ "InboxOn": {} ++ }, + "Microsoft.NETCore.Targets": { + "StableVersions": [ + "1.0.0", +@@ -188,7 +206,8 @@ + "1.1.3", + "1.1.4", + "2.0.0", +- "2.1.0" ++ "2.1.0", ++ "3.0.0" + ], + "BaselineVersion": "3.0.0", + "InboxOn": {} +@@ -319,7 +338,8 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -336,7 +356,8 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -350,7 +371,8 @@ + }, + "Microsoft.Win32.SystemEvents": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -363,7 +385,8 @@ + "StableVersions": [ + "2.0.0", + "2.0.1", +- "2.1.0" ++ "2.1.0", ++ "3.0.0" + ], + "InboxOn": {} + }, +@@ -377,7 +400,8 @@ + "Microsoft.XmlSerializer.Generator": { + "StableVersions": [ + "1.0.0", +- "2.0.0" ++ "2.0.0", ++ "2.1.0" + ], + "BaselineVersion": "2.1.0", + "InboxOn": {}, +@@ -543,12 +567,16 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {} + }, + "runtime.native.System.IO.Ports": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {} + }, +@@ -692,7 +720,8 @@ + "System.CodeDom": { + "StableVersions": [ + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -789,7 +818,8 @@ + "1.3.1", + "1.3.2", + "1.4.0", +- "1.5.0" ++ "1.5.0", ++ "1.6.0" + ], + "BaselineVersion": "1.6.0", + "InboxOn": { +@@ -908,7 +938,8 @@ + "4.3.0", + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -941,7 +972,8 @@ + }, + "System.ComponentModel.Composition": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -959,6 +991,9 @@ + } + }, + "System.ComponentModel.Composition.Registration": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": { + "net45": "4.0.0.0" +@@ -1082,7 +1117,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {} +@@ -1091,7 +1127,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {}, +@@ -1106,7 +1143,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {}, +@@ -1121,7 +1159,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {}, +@@ -1136,7 +1175,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {}, +@@ -1151,7 +1191,8 @@ + "StableVersions": [ + "1.0.31", + "1.1.0", +- "1.2.0" ++ "1.2.0", ++ "1.3.0" + ], + "BaselineVersion": "1.3.0", + "InboxOn": {}, +@@ -1173,7 +1214,8 @@ + "StableVersions": [ + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -1314,7 +1356,8 @@ + }, + "System.Data.Odbc": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -1324,6 +1367,9 @@ + } + }, + "System.Data.OleDb": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -1368,7 +1414,8 @@ + "4.5.0", + "4.5.1", + "4.6.0", +- "4.6.1" ++ "4.6.1", ++ "4.7.0" + ], + "BaselineVersion": "4.7.0", + "InboxOn": { +@@ -1504,7 +1551,8 @@ + "4.4.0", + "4.4.1", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -1524,7 +1572,8 @@ + }, + "System.Diagnostics.EventLog": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -1559,7 +1608,8 @@ + }, + "System.Diagnostics.PerformanceCounter": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -1769,7 +1819,8 @@ + }, + "System.DirectoryServices": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -1781,7 +1832,8 @@ + }, + "System.DirectoryServices.AccountManagement": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -1793,7 +1845,8 @@ + }, + "System.DirectoryServices.Protocols": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -1814,7 +1867,8 @@ + "System.Drawing.Common": { + "StableVersions": [ + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -2185,7 +2239,8 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -2334,7 +2389,8 @@ + "4.3.0", + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -2351,7 +2407,8 @@ + "4.5.0", + "4.5.1", + "4.5.2", +- "4.5.3" ++ "4.5.3", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -2399,7 +2456,8 @@ + "System.IO.Ports": { + "StableVersions": [ + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -2441,7 +2499,8 @@ + "System.Json": { + "StableVersions": [ + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -2617,7 +2676,8 @@ + }, + "System.Management": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -2806,7 +2866,8 @@ + "4.5.1", + "4.5.2", + "4.5.3", +- "4.5.4" ++ "4.5.4", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -3204,7 +3265,8 @@ + "4.5.0", + "4.5.1", + "4.5.2", +- "4.5.3" ++ "4.5.3", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -3432,7 +3494,8 @@ + "StableVersions": [ + "4.0.0", + "4.0.1", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3456,7 +3519,8 @@ + "4.3.0", + "4.4.0", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3485,7 +3549,8 @@ + "StableVersions": [ + "4.0.0", + "4.0.1", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3507,7 +3572,8 @@ + "StableVersions": [ + "4.0.0", + "4.0.1", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3534,7 +3600,8 @@ + "StableVersions": [ + "4.0.0", + "4.0.1", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3608,7 +3675,8 @@ + "1.4.2", + "1.4.3", + "1.5.0", +- "1.6.0" ++ "1.6.0", ++ "1.7.0" + ], + "BaselineVersion": "1.7.0", + "InboxOn": { +@@ -3630,6 +3698,9 @@ + } + }, + "System.Reflection.MetadataLoadContext": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -3683,7 +3754,8 @@ + "4.3.0", + "4.4.0", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3709,6 +3781,9 @@ + } + }, + "System.Resources.Extensions": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +@@ -3854,7 +3929,8 @@ + }, + "System.Runtime.Caching": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -3877,7 +3953,8 @@ + "4.4.0", + "4.5.0", + "4.5.1", +- "4.5.2" ++ "4.5.2", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4357,7 +4434,8 @@ + "4.0.0", + "4.0.10", + "4.0.11", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4386,7 +4464,8 @@ + "StableVersions": [ + "4.0.0", + "4.0.1", +- "4.3.0" ++ "4.3.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4417,7 +4496,8 @@ + "4.3.0", + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4490,7 +4570,8 @@ + "4.2.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4569,7 +4650,8 @@ + "4.3.1", + "4.4.0", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -4589,7 +4671,8 @@ + "4.4.0", + "4.5.0", + "4.5.1", +- "4.5.2" ++ "4.5.2", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -4633,7 +4716,8 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4686,7 +4770,8 @@ + "4.4.0", + "4.4.1", + "4.4.2", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -4700,7 +4785,8 @@ + "StableVersions": [ + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -4757,7 +4843,8 @@ + "4.4.0", + "4.4.1", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -4934,7 +5021,8 @@ + }, + "System.ServiceModel.Syndication": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -4983,7 +5071,8 @@ + "4.3.0", + "4.4.0", + "4.4.1", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -5050,13 +5139,14 @@ + "4.3.0", + "4.4.0", + "4.5.0", +- "4.5.1" ++ "4.5.1", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { ++ "netcoreapp3.0": "4.1.2.0", + "monoandroid10": "Any", + "monotouch10": "Any", +- "netcoreapp3.0": "4.1.2.0", + "uap10.0.16299": "4.1.1.0", + "uap10.0.16300": "4.1.2.0", + "xamarinios10": "Any", +@@ -5123,7 +5213,8 @@ + "4.3.0", + "4.3.1", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": { +@@ -5139,6 +5230,9 @@ + } + }, + "System.Text.Json": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": { + "netcoreapp3.0": "4.0.0.0", +@@ -5242,7 +5336,8 @@ + "4.0.0", + "4.3.0", + "4.4.0", +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, +@@ -5256,12 +5351,13 @@ + }, + "System.Threading.Channels": { + "StableVersions": [ +- "4.5.0" ++ "4.5.0", ++ "4.6.0" + ], + "BaselineVersion": "4.6.0", +- "InboxOn": { +- "netcoreapp3.0": "4.0.1.0" +- }, ++ "InboxOn": { ++ "netcoreapp3.0": "4.0.1.0" ++ }, + "AssemblyVersionInPackageVersion": { + "4.0.0.0": "4.5.0", + "4.0.1.0": "4.6.0" +@@ -5345,7 +5441,8 @@ + "4.6.0", + "4.7.0", + "4.8.0", +- "4.9.0" ++ "4.9.0", ++ "4.10.0" + ], + "BaselineVersion": "4.10.0", + "InboxOn": { +@@ -5685,6 +5782,9 @@ + } + }, + "System.Windows.Extensions": { ++ "StableVersions": [ ++ "4.6.0" ++ ], + "BaselineVersion": "4.6.0", + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { +-- +2.17.1.windows.2 + diff --git a/patches/msbuild/0003-Remove-dotnet-call-with-no-path.patch b/patches/msbuild/0003-Remove-dotnet-call-with-no-path.patch new file mode 100644 index 0000000000..bd7c0570f4 --- /dev/null +++ b/patches/msbuild/0003-Remove-dotnet-call-with-no-path.patch @@ -0,0 +1,29 @@ +From 74a928ce82f39ebda4ad96652fbf1c61d7a1738d Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 25 Sep 2019 19:36:21 -0500 +Subject: [PATCH 3/3] Remove dotnet call with no path + +--- + eng/common/tools.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 757d5b9e..a8fabf54 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -338,12 +338,6 @@ function MSBuild { + InitializeBuildTool + InitializeToolset + +- # Work around issues with Azure Artifacts credential provider +- # https://github.com/dotnet/arcade/issues/3932 +- if [[ "$ci" == true ]]; then +- dotnet nuget locals http-cache -c +- fi +- + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) +-- +2.18.0 + diff --git a/patches/sdk/0001-Add-missing-PlatformAbstractions-reference.patch b/patches/sdk/0001-Add-missing-PlatformAbstractions-reference.patch index 918b8a6945..2c119572ed 100644 --- a/patches/sdk/0001-Add-missing-PlatformAbstractions-reference.patch +++ b/patches/sdk/0001-Add-missing-PlatformAbstractions-reference.patch @@ -1,24 +1,24 @@ -From 78a90032094db8fdad8c6e6610df8e31adf3760c Mon Sep 17 00:00:00 2001 +From 0f2f63190f0116e70daa1c37458fa117dc4004d4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 23 May 2019 01:20:00 -0500 Subject: [PATCH 1/2] Add missing PlatformAbstractions reference. --- - src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 2889bdd..f9c4774 100644 +index 86eef5d2..f03320ce 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -42,6 +42,7 @@ +@@ -41,6 +41,7 @@ + - + -- -1.8.3.1 +2.18.0 diff --git a/patches/sdk/0002-Use-ref-only-msbuild-packages.patch b/patches/sdk/0002-Use-ref-only-msbuild-packages.patch index b6aca96f72..652586a9d4 100644 --- a/patches/sdk/0002-Use-ref-only-msbuild-packages.patch +++ b/patches/sdk/0002-Use-ref-only-msbuild-packages.patch @@ -1,18 +1,18 @@ -From babaff5582891575d99b11ecdcfe6afb008dd7c5 Mon Sep 17 00:00:00 2001 +From a547de169a7e7bac594032488fbc517fe4011682 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 21 Aug 2019 21:36:24 +0000 Subject: [PATCH 2/2] Use ref-only msbuild packages --- - .../Microsoft.NET.Build.Extensions.Tasks.csproj | 5 +++-- - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 7 ++++--- + .../Microsoft.NET.Build.Extensions.Tasks.csproj | 5 +++-- + .../Microsoft.NET.Build.Tasks.csproj | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -index cd4d4f8..d1fcb7c 100644 +index df2904a9..47e4e80b 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -@@ -41,8 +41,9 @@ +@@ -40,8 +40,9 @@ @@ -25,10 +25,10 @@ index cd4d4f8..d1fcb7c 100644 diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index f9c4774..22b5c64 100644 +index f03320ce..48f89ae7 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -38,9 +38,10 @@ +@@ -37,9 +37,10 @@ @@ -43,5 +43,5 @@ index f9c4774..22b5c64 100644 -- -1.8.3.1 +2.18.0 diff --git a/patches/sdk/0003-Don-t-call-dotnet-without-path.patch b/patches/sdk/0003-Don-t-call-dotnet-without-path.patch new file mode 100644 index 0000000000..97a8fffda7 --- /dev/null +++ b/patches/sdk/0003-Don-t-call-dotnet-without-path.patch @@ -0,0 +1,29 @@ +From c798bbb81ee50fa53746d71b5c1e82041ee2b0c7 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 26 Sep 2019 07:41:22 -0500 +Subject: [PATCH 3/3] Don't call dotnet without path + +--- + eng/common/tools.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 757d5b9e..a8fabf54 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -338,12 +338,6 @@ function MSBuild { + InitializeBuildTool + InitializeToolset + +- # Work around issues with Azure Artifacts credential provider +- # https://github.com/dotnet/arcade/issues/3932 +- if [[ "$ci" == true ]]; then +- dotnet nuget locals http-cache -c +- fi +- + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) +-- +2.18.0 + diff --git a/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch b/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch new file mode 100644 index 0000000000..3e94270f11 --- /dev/null +++ b/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch @@ -0,0 +1,29 @@ +From 162ec70b0f7d8bc7acc4521a507201ecf09e74e2 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 26 Sep 2019 02:58:28 -0500 +Subject: [PATCH] Don't call dotnet with no path + +--- + eng/common/tools.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 757d5b9e..a8fabf54 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -338,12 +338,6 @@ function MSBuild { + InitializeBuildTool + InitializeToolset + +- # Work around issues with Azure Artifacts credential provider +- # https://github.com/dotnet/arcade/issues/3932 +- if [[ "$ci" == true ]]; then +- dotnet nuget locals http-cache -c +- fi +- + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) +-- +2.18.0 + diff --git a/patches/templating/0001-Fix-property-name.patch b/patches/templating/0001-Fix-property-name.patch deleted file mode 100644 index 8a7f87f19b..0000000000 --- a/patches/templating/0001-Fix-property-name.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ec3c74b2c90d6a1e6f41e5edcd883a2061efa38f Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 7 Aug 2019 09:10:06 -0500 -Subject: [PATCH] Fix property name - ---- - Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 657b9547..e1536da5 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -9,7 +9,7 @@ - - - -- -+ - - - --- -2.21.0 - diff --git a/patches/toolset/0002-Remove-WindowsDesktop-dependency.patch b/patches/toolset/0002-Remove-WindowsDesktop-dependency.patch new file mode 100644 index 0000000000..b1688e1f2e --- /dev/null +++ b/patches/toolset/0002-Remove-WindowsDesktop-dependency.patch @@ -0,0 +1,24 @@ +From acd36fac5391102ea8139b5d2bd1b207305bfd99 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 25 Sep 2019 11:24:07 -0500 +Subject: [PATCH 2/2] Remove WindowsDesktop dependency + +--- + src/redist/targets/BundledSdks.targets | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/redist/targets/BundledSdks.targets b/src/redist/targets/BundledSdks.targets +index d7c5440f5..87f4c9761 100644 +--- a/src/redist/targets/BundledSdks.targets ++++ b/src/redist/targets/BundledSdks.targets +@@ -7,7 +7,6 @@ + + + +- + + + +-- +2.18.0 + diff --git a/patches/websdk/0001-Add-PVP-import.patch b/patches/websdk/0001-Add-PVP-import.patch index 6625929c47..6f2b6ddc8c 100644 --- a/patches/websdk/0001-Add-PVP-import.patch +++ b/patches/websdk/0001-Add-PVP-import.patch @@ -1,18 +1,18 @@ -From c1e8014464bd27414258fec0f72b5762c8a0bb44 Mon Sep 17 00:00:00 2001 +From b80de46a2cb225f23fb4d5c6907ce336218bc1da Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 28 Aug 2019 14:26:39 -0500 Subject: [PATCH] Add PVP import. --- - eng/Versions.props | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + eng/Versions.props | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props -index b50d4d0..976db3f 100644 +index f895dc5..039d2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ - rc1 + rc2 - @@ -20,13 +20,12 @@ index b50d4d0..976db3f 100644 $(RestoreSources); https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json; -@@ -48,4 +48,7 @@ - 3.0.0-rc1.19457.4 - 3.0.0-rc1.19457.4 +@@ -48,4 +48,6 @@ + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 + + -+ -- 2.18.0 diff --git a/repos/arcade.proj b/repos/arcade.proj index 97d00e0776..d230ffaab1 100644 --- a/repos/arcade.proj +++ b/repos/arcade.proj @@ -29,6 +29,7 @@ true + true diff --git a/repos/cli.proj b/repos/cli.proj index 5142846715..257cd5ef14 100644 --- a/repos/cli.proj +++ b/repos/cli.proj @@ -36,12 +36,21 @@ true $(ProjectDirectory)global.json + + $(SourceBuiltPackagesPath) + $(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) + $(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + + + + diff --git a/repos/core-setup.proj b/repos/core-setup.proj index 14fc4ac8f1..d69070b506 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -18,7 +18,6 @@ $(BuildArguments) /p:BuildAllPackages=true $(BuildArguments) /p:RestoreAllBuildRids=false $(BuildArguments) /p:OutputRid=$(OverrideTargetRid) - $(BuildArguments) /p:PreReleaseLabel="$(PreReleaseVersionLabel)" $(BuildArguments) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir) true @@ -47,6 +46,7 @@ + diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 7c39a07b5f..eb3d3033a8 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -21,6 +21,7 @@ $(BuildArguments) /p:CheckCDefines=false $(BuildArguments) /p:PackagesDir=$(PackagesDir) $(BuildArguments) /p:ContinuousIntegrationBuild=true + $(BuildArguments) /p:VersionSuffix="$(PreReleaseVersionLabel)" $(BuildArguments) -warnAsError:0 $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) diff --git a/repos/dir.props b/repos/dir.props index d919efad7e..176521c771 100644 --- a/repos/dir.props +++ b/repos/dir.props @@ -73,8 +73,10 @@ - - + + + + diff --git a/repos/msbuild.proj b/repos/msbuild.proj index 9cdefe0908..9bb6e0ec88 100644 --- a/repos/msbuild.proj +++ b/repos/msbuild.proj @@ -47,6 +47,7 @@ + diff --git a/repos/sourcelink.proj b/repos/sourcelink.proj index 329bea3316..e65a6a58fb 100644 --- a/repos/sourcelink.proj +++ b/repos/sourcelink.proj @@ -18,6 +18,7 @@ true + true diff --git a/repos/templating.proj b/repos/templating.proj index 0aae8d752f..01bd81791a 100644 --- a/repos/templating.proj +++ b/repos/templating.proj @@ -2,7 +2,8 @@ - $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/ + $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/ + $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ false --restore --pack --configuration $(Configuration) $(OutputVersionArgs) @@ -39,6 +40,13 @@ + + + + + + + diff --git a/repos/xliff-tasks.proj b/repos/xliff-tasks.proj index 21321cc326..6185ed01cf 100644 --- a/repos/xliff-tasks.proj +++ b/repos/xliff-tasks.proj @@ -16,6 +16,7 @@ false N/A true + true diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 87a4b8ccfa..f453c8d08d 100644 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -51,7 +51,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -149,8 +149,8 @@ - - + + @@ -209,10 +209,10 @@ - - - - + + + + @@ -222,9 +222,13 @@ + + + + @@ -261,7 +265,6 @@ - diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 2291d52831..2726ab191f 100755 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -3,35 +3,35 @@ bin/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ bin/src/arcade.8f3c22397990aeb20a88690b51dad4b33f21e7ff/ - bin/src/Extensions.73c259904d5db01bbeede15df2a72d1b94cb3306/ + bin/src/Extensions.0b951c16de0f39e13cce8372e11c28eb90576662/ bin/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - bin/src/AspNetCore-Tooling.d8f651aa5281e9fa60a8fe0dcad98efeb7720a36/ - bin/src/AspNetCore.49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad/ - bin/src/cli.70cf7521b833e92afe13864c775399a2e6922176/ + bin/src/AspNetCore-Tooling.16b0ca4a5838c39c8852e6cf144232597e2bee2e/ + bin/src/AspNetCore.aee5e4080331553ea9dfb7fb388b6d72f715bf6a/ + bin/src/cli.e72d84f73adcbfa0054df27fbb21505295a55dcb/ bin/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ bin/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - bin/src/core-sdk.c4d43f672d8c1bca944a2177d517223028629f54/ - bin/src/core-setup.8f5d7b1ba4f744199ba006cac38dfcb9a2408880/ - bin/src/coreclr.aed84886b8d777168f53fae4da15c7af5f7572da/ - bin/src/corefx.3da667af759d88b683ca851694ced073e8dc9960/ + bin/src/core-sdk.04339c3a262a2e313f9431edd3805ce71e08b92e/ + bin/src/core-setup.7d57652f33493fa022125b7f63aad0d70c52d810/ + bin/src/coreclr.922429db0144dd6f3b4324805464dae82857512a/ + bin/src/corefx.4ac4c0367003fe3973a3648eb0715ddb0e3bbcea/ bin/src/fsharp.0422ff293bb2cc722fe5021b85ef50378a9af823/ bin/src/known-good-tests./ bin/src/known-good./ bin/src/linker.1127689f262d52ea8ff68ef03d706fa62b3b40a1/ - bin/src/msbuild.4a2d771074b97bcc31125801b4a9ea57900d84d6/ + bin/src/msbuild.0f4c62feac0a5726f63b56472de7b1c1527459fc/ src/netcorecli-fsc/ bin/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ bin/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - bin/src/NuGet.Client.bb60d6720d24890b8f3e071e70d27ea0f2bef57e/ + bin/src/NuGet.Client.b75150f2f4127a77a166c9552845e86fb24a3282/ src/package-source-build/ - bin/src/roslyn.3b423bd305daf81076d4d7b105101361c2490531/ - bin/src/sdk.b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5/ + bin/src/roslyn.66a912c9463eebe832cf742d2fe8bb2e1a4600ec/ + bin/src/sdk.b3a343bf8ed65f5208c5bb86c632856c5d107b1d/ bin/src/sourcelink.51310e65e75010467993f793e1739d1a1dad50c5/ - bin/src/standard.209c43e7f6232e7871b6927a510c25ee7dfd5c72/ - bin/src/templating.e8d6da33000a416b2b36b4f04b1756dcc99f671d/ - bin/src/toolset.8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03/ - bin/src/vstest.2479b26734a98a9594590ee13e895aa58b5f0a6b/ - bin/src/websdk.0141a0efbdad0ece12294cec1f6da1c03502e021/ + bin/src/standard.a5b5f2e1e369972c8ff1e2183979fab6099f52ef/ + bin/src/templating.b2663fb07294f5d6cf3caa927d58f7cbebf7d626/ + bin/src/toolset.33026f95de81116aefd79b4ec4c8071090a02480/ + bin/src/vstest.55e7e45431c9c05656c999b902686e7402664573/ + bin/src/websdk.002ea5ca7c699d925281abd8307556ec8eccb530/ bin/src/xliff-tasks.173ee3bd61c9549557eefa3cfb718bdef157cb87/ Tools/ tools-local/tasks/ @@ -54,7 +54,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -110,15 +110,13 @@ - + - + - - - + @@ -134,26 +132,30 @@ + - + - + - + + - + - + + - + + @@ -162,14 +164,15 @@ + - - + + @@ -191,7 +194,7 @@ - + @@ -269,10 +272,10 @@ - - - - + + + + @@ -309,9 +312,13 @@ + + + + @@ -420,7 +427,7 @@ - + @@ -469,7 +476,6 @@ - diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs index 5a79ed2e10..d059297149 100644 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs @@ -40,6 +40,12 @@ public override bool Execute() string binaryFileName = Path.GetFileName(binaryFullPath); string version = Regex.Match(binaryFileName, VersionMatchRegex).Groups["semver"].Value; + // workaround the RID being included for now - regex needs to be reworked for stable versions + if (version.EndsWith("-linux")) + { + version = version.Substring(0, version.Length - "-linux".Length); + } + if (version == "") { Log.LogError($"Could not extract version information from {binaryFileName}");