From 733c7be490bd987456f6f8a166fbc3321f425543 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 20 Mar 2019 13:43:48 -0700 Subject: [PATCH 001/896] Update branding to 2.1.7xx --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index bce993e41ec9..1e2c0c6f2582 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 603 + 700 preview $(VersionMajor).$(VersionMinor) From d99bd8b8f4d51c1cb6b619a7106190578d6ce1d8 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 21 Mar 2019 14:22:28 -0700 Subject: [PATCH 002/896] Insert NuGet Build 5.1.0-rtm.5906 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dc571410df29..4bd90f249fb9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.0.0-rtm.5867 + 5.1.0-rtm.5906 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 1500f81a1ceec8a8f18ee304e3d08cba78802c4f Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 26 Mar 2019 09:19:30 -0700 Subject: [PATCH 003/896] Sdk 2.1.700-preview-63926-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4bd90f249fb9..652b00f9151d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.600-preview-63905-02 + 2.1.700-preview-63926-01 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 66b875dd91879a68aecd3b5a411567c1132c220f Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 3 Apr 2019 10:54:34 -0500 Subject: [PATCH 004/896] MSBuild 16.1.27 (#11062) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 652b00f9151d..d55cdcfc97ad 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.0.450 + 16.1.0-preview.27 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 96b18bcb5cd6289b58fa1e29090219075684f9c4 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 3 Apr 2019 12:05:33 -0700 Subject: [PATCH 005/896] Insert roslyn for 16.1 P1 (2.1.7xx) (#11064) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d55cdcfc97ad..bb36aef16439 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.2-rtm-190215-08 - 3.0.0-beta4-19120-05 + 3.1.0-beta1-19172-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From f8e64d64826d2a2ba34a3ffac164c6fe71e9433a Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 11 Apr 2019 07:17:11 -0700 Subject: [PATCH 006/896] Insert NuGet Build 5.1.0-preview2.5951 into cli (#11113) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index bb36aef16439..bf649e328f99 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.1.0-rtm.5906 + 5.1.0-preview2.5951 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From b3075adeae3fbf6a884ac4266532c23cb280ae56 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 15 Apr 2019 15:11:02 -0500 Subject: [PATCH 007/896] MSBuild 16.1.59 (2.1.7xx) (#11156) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index bf649e328f99..d25c6329e48d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.1.0-preview.27 + 16.1.0-preview.59 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From de0e7e31b124a2c2dfec778f37a2b374ed945342 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 16 Apr 2019 12:56:07 -0700 Subject: [PATCH 008/896] Roslyn 3.1.0-beta2-19211-01 (2.1.7xx) (#11159) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d25c6329e48d..e747bf833c57 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.2-rtm-190215-08 - 3.1.0-beta1-19172-05 + 3.1.0-beta2-19211-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From b41f2744e1462bb47c0a47cb213ebd115becbfbb Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 16 Apr 2019 15:26:35 -0700 Subject: [PATCH 009/896] dotnet/sdk 2.1.700-preview-64015-02 (#11173) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e747bf833c57..4d571882fd78 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.700-preview-63926-01 + 2.1.700-preview-64015-02 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 1d88a76d75433f3ff81bf337dfc9e3abdcd2b104 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Wed, 17 Apr 2019 09:11:16 -0700 Subject: [PATCH 010/896] Update FSharp compiler to 10.4.3 (#11181) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4d571882fd78..b00859091470 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.4.2-rtm-190215-08 + 10.4.3-beta.19217.1 3.1.0-beta2-19211-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 1c95b59920b885ff6c3a5ddf7e2b07b069cba51b Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 17 Apr 2019 16:05:41 -0700 Subject: [PATCH 011/896] Revert "Update FSharp compiler to 10.4.3 (#11181)" (#11187) This reverts commit 1d88a76d75433f3ff81bf337dfc9e3abdcd2b104. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b00859091470..4d571882fd78 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.4.3-beta.19217.1 + 10.4.2-rtm-190215-08 3.1.0-beta2-19211-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 529118ffcde54210323c375bbc4544f9771f3800 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 18 Apr 2019 20:06:26 -0700 Subject: [PATCH 012/896] Insert NuGet Build 5.1.0-preview2.5965 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4d571882fd78..86682612c65f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.1.0-preview2.5951 + 5.1.0-preview2.5965 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c09aa48ec795ab1e6b0ae1aa997f2fce05d3ed74 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 19 Apr 2019 09:28:20 -0700 Subject: [PATCH 013/896] update F# --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4d571882fd78..3c58bce7e9a2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.4.2-rtm-190215-08 + 10.4.3-beta.19222.1 3.1.0-beta2-19211-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From c70781b7fe02fa42200911f596cb0520423c138d Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 28 Mar 2019 10:00:38 -0700 Subject: [PATCH 014/896] Update debain jessie image --- scripts/docker/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/debian/Dockerfile b/scripts/docker/debian/Dockerfile index 4b5515ec0c8e..e8316daed09d 100644 --- a/scripts/docker/debian/Dockerfile +++ b/scripts/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:debian-8.2-debpkg-d770b8b-20180628122423 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153 # Misc Dependencies for build RUN rm -rf /var/lib/apt/lists/* && \ From c86a2fa5a31389694c7134837d77b6d2d2c070d2 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Tue, 23 Apr 2019 18:57:01 -0700 Subject: [PATCH 015/896] update F# --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c58bce7e9a2..0b72b5f16103 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.4.3-beta.19222.1 + 10.4.3-beta.19224.1 3.1.0-beta2-19211-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From d5a810d47c749390b106fc9f1bcc87f94dd53836 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 24 Apr 2019 16:18:27 +0000 Subject: [PATCH 016/896] Update the BranchInfo for release/2.1.7xx --- build/BranchInfo.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index d37642ff2e9e..c8ff90e7d041 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.1.6xx - release/2.1.6xx + release/2.1.7xx + release/2.1.7xx From 882e1f32748c7025efa2240d42d51eaa9b5df122 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Sun, 28 Apr 2019 21:57:11 -0700 Subject: [PATCH 017/896] Update the SDK to `2.1.700-preview-64023-01`. This commit updates the SDK to `2.1.700-preview-64023-01`. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4769c70789a0..2bec1096ea2e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.700-preview-64015-02 + 2.1.700-preview-64023-01 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 6cf85129be34e5ac4cd2925652f28102e75c29b1 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 25 Apr 2019 14:05:11 -0500 Subject: [PATCH 018/896] MSBuild 16.1.68 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 86682612c65f..cbac3b42821f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.1.0-preview.59 + 16.1.0-preview.68 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From bb506074b85643b883ae4f660731e3088de81611 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 29 Apr 2019 14:45:04 -0700 Subject: [PATCH 019/896] Update Roslyn to `3.1.0-beta3-19223-09`. This commit updates Roslyn to `3.1.0-beta3-19223-09`. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2bec1096ea2e..7408246371e8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19224.1 - 3.1.0-beta2-19211-01 + 3.1.0-beta3-19223-09 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From b41d860096bad342a7c76ccd394ea4555855d716 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 3 May 2019 11:37:03 -0700 Subject: [PATCH 020/896] update F# --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1a0cc4bf270d..8fcdbfd42741 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.4.3-beta.19224.1 + 10.4.3-beta.19253.3 3.1.0-beta3-19223-09 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 789dd3c75a14..e356aaef8381 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -32,6 +32,7 @@ + ]]> From ae9aab78d3e66ad6eea008100959b7807fef4b22 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 6 May 2019 12:48:01 -0500 Subject: [PATCH 021/896] MSBuild 16.1.73 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1a0cc4bf270d..8da17af0e3ba 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.1.0-preview.68 + 16.1.73 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 92e4040e4c3079cde7371b660783f66ed23d9a53 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Mon, 6 May 2019 11:19:08 -0700 Subject: [PATCH 022/896] Insert NuGet Build 5.1.0-rtm.6003 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1a0cc4bf270d..358ed8f5d4e1 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.1.0-preview2.5965 + 5.1.0-rtm.6003 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From fb6fe8bd542ef4772ad29118d7b96919303443da Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 8 May 2019 13:46:02 -0700 Subject: [PATCH 023/896] Insert NuGet Build 5.1.0-rtm.6013 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5f3feaf3f6cb..e5ac2b5bb1da 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.1.0-rtm.6003 + 5.1.0-rtm.6013 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From d82491bd12fa3baa0b68a5df976896f768b2836f Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 9 May 2019 13:54:04 -0700 Subject: [PATCH 024/896] Update SDK to 2.1.700-preview-64109-02 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e5ac2b5bb1da..f53a610882f9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.700-preview-64023-01 + 2.1.700-preview-64109-02 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From a8bd14a60c9ef4d9982ad8a6c379287b12e325d3 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 9 May 2019 12:31:07 -0700 Subject: [PATCH 025/896] TestPlatform insertion --- build/DependencyVersions.props | 2 +- ...ildsAndRunsTestFromCsprojForMultipleTFM.cs | 24 ++++--- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 64 ++++++++++++------- test/dotnet-vstest.Tests/VSTestTests.cs | 8 ++- 4 files changed, 63 insertions(+), 35 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a20f9b38967b..2d1e971c88e4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -53,7 +53,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 16.0.1 + 16.1.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs index c64cdfc4e3e1..ca8a0074e8ae 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs @@ -38,10 +38,14 @@ public void MStestMultiTFM() if (!DotnetUnderTest.IsLocalized()) { result.StdOut - .Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass") - .And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass") - .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail") - .And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); + .Should().Contain("Total tests: 3") + .And.Contain("Passed: 2") + .And.Contain("Failed: 1") + .And.Contain("\u221a VSTestPassTestDesktop", "because .NET 4.6 tests will pass") + .And.Contain("Total tests: 3") + .And.Contain("Passed: 1") + .And.Contain("Failed: 2") + .And.Contain("X VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); } result.ExitCode.Should().Be(1); } @@ -73,12 +77,16 @@ public void XunitMultiTFM() if (!DotnetUnderTest.IsLocalized()) { // for target framework net46 - result.StdOut.Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop"); + result.StdOut.Should().Contain("Total tests: 3"); + result.StdOut.Should().Contain("Passed: 2"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop"); // for target framework netcoreapp1.0 - result.StdOut.Should().Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0."); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp"); + result.StdOut.Should().Contain("Total tests: 3"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 2"); + result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp"); } result.ExitCode.Should().Be(1); diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 65f4b3716597..3e19d023979d 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -29,9 +29,11 @@ public void MSTestSingleTFM() // Verify if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed VSTestPassTest"); - result.StdOut.Should().Contain("Failed VSTestFailTest"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("\u221a VSTestPassTest"); + result.StdOut.Should().Contain("X VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -53,9 +55,13 @@ public void ItImplicitlyRestoresAProjectWhenTesting() if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed VSTestPassTest"); - result.StdOut.Should().Contain("Failed VSTestFailTest"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("\u221a VSTestPassTest"); + result.StdOut.Should().Contain("X VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -120,9 +126,11 @@ public void XunitSingleTFM() // Verify if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); + result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); } result.ExitCode.Should().Be(1); @@ -143,9 +151,11 @@ public void GivenAFailingTestItDisplaysFailureDetails() if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); + result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); result.StdOut.Should().Contain("Assert.Equal() Failure"); - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } } @@ -174,8 +184,8 @@ public void ItAcceptsMultipleLoggersAsCliArguments() // We append current date time to trx file name, hence modifying this check Assert.True(Directory.EnumerateFiles(trxLoggerDirectory, trxFileNamePattern).Any()); - result.StdOut.Should().Contain("Passed VSTestPassTest"); - result.StdOut.Should().Contain("Failed VSTestFailTest"); + result.StdOut.Should().Contain("\u221a VSTestPassTest"); + result.StdOut.Should().Contain("X VSTestFailTest"); } // Cleanup trxLoggerDirectory if it exist @@ -301,9 +311,11 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory() if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed VSTestPassTest"); - result.StdOut.Should().Contain("Failed VSTestFailTest"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("\u221a VSTestPassTest"); + result.StdOut.Should().Contain("X VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -323,15 +335,16 @@ public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests() // Verify if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().NotContain("Passed TestNamespace.VSTestTests.VSTestPassTest"); - result.StdOut.Should().NotContain("Failed TestNamespace.VSTestTests.VSTestFailTest"); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().NotContain("\u221a TestNamespace.VSTestTests.VSTestPassTest"); + result.StdOut.Should().NotContain("X TestNamespace.VSTestTests.VSTestFailTest"); } result.ExitCode.Should().Be(1); } - [WindowsOnlyFact] public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings() { @@ -357,7 +370,9 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings() // Verify test results if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } // Verify coverage file. @@ -391,7 +406,9 @@ public void ItCreatesCoverageFileInResultsDirectory() // Verify test results if (!DotnetUnderTest.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); + result.StdOut.Should().Contain("Total tests: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } // Verify coverage file. @@ -418,7 +435,8 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage() if (!DotnetUnderTest.IsLocalized()) { result.StdOut.Should().Contain("No code coverage data available. Code coverage is currently supported only on Windows."); - result.StdOut.Should().Contain("Total tests: 1. Passed: 1. Failed: 0. Skipped: 0."); + result.StdOut.Should().Contain("Total tests: 1"); + result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Test Run Successful."); } diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs index c6a7dd0358f8..d3388f45a563 100644 --- a/test/dotnet-vstest.Tests/VSTestTests.cs +++ b/test/dotnet-vstest.Tests/VSTestTests.cs @@ -41,9 +41,11 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput() if (!DotnetUnderTest.IsLocalized()) { result.StdOut - .Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.") - .And.Contain("Passed VSTestPassTest") - .And.Contain("Failed VSTestFailTest"); + .Should().Contain("Total tests: 2") + .And.Contain("Passed: 1") + .And.Contain("Failed: 1") + .And.Contain("\u221a VSTestPassTest") + .And.Contain("X VSTestFailTest"); } result.ExitCode.Should().Be(1); From 45245ad665143dc19b74dc5c0e56198f384dccfd Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 14 May 2019 09:27:57 -0700 Subject: [PATCH 026/896] Updating MSBuild to 16.1.76 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 52817cc4c86b..02636288bc27 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.1.73 + 16.1.76 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 87fea818f87bfb3c875ecdcc0883b2483d95b937 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 May 2019 09:34:44 -0700 Subject: [PATCH 027/896] Updating the branding to 2.1.8xx. --- build/BranchInfo.props | 4 ++-- build/Version.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index c8ff90e7d041..0dd99c72a3ff 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.1.7xx - release/2.1.7xx + release/2.1.8xx + release/2.1.8xx diff --git a/build/Version.props b/build/Version.props index 1e2c0c6f2582..5355aedba8bc 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 700 + 800 preview $(VersionMajor).$(VersionMinor) From 14e3b785486f26610620cb4a60fb99412970598b Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 14 May 2019 10:11:45 -0700 Subject: [PATCH 028/896] Update MSBuild 16.2.0-preview.19264.2 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 52817cc4c86b..f2039c976ec0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.9 $(MicrosoftNETCoreAppPackageVersion) - 16.1.73 + 16.2.0-preview.19264.2 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 3fb2fea4552a9b1aa2543b97b73b100bdddd9d6d Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 14 May 2019 12:05:58 -0700 Subject: [PATCH 029/896] Update Roslyn 3.1.0-beta4-19261-04 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 02636288bc27..ff841ceb89d8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19253.3 - 3.1.0-beta3-19223-09 + 3.1.0-beta4-19261-04 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 8942e7a184af40044fe520acc5f94dacd088f384 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 14 May 2019 14:06:20 -0700 Subject: [PATCH 030/896] Update Roslyn to 3.2.0-beta1-19263-09 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 52817cc4c86b..4e92ce0269c8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19253.3 - 3.1.0-beta3-19223-09 + 3.2.0-beta1-19263-09 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 1e16bc4597ebe065870c9ea34c2471f3da8ac8a2 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 15 May 2019 12:59:19 -0700 Subject: [PATCH 031/896] Update references to release/2.1.6xx to release/2.1.7xx. This commit updates the README references of the branch name to release/2.1.7xx. --- README.md | 68 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index ef74854619e3..666a403c7b15 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v2.0 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the release/2.1.6xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.1.7xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core Found an issue? @@ -65,7 +65,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). > In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with. -| Platform | Latest Daily Build
*release/2.1.6xx*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.1.7xx*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -76,7 +76,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | | **Linux-musl** | [tar.gz][linux-musl-targz] - [Checksum][linux-musl-targz-checksum] | -| Latest Coherent Build2
*release/2.1.6xx* | +| Latest Coherent Build2
*release/2.1.7xx* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -84,47 +84,47 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/latest.coherent.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/latest.version +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/win_x64_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/win_x64_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/win_x64_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-arm.tar.gz -[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm.tar.gz.sha -[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-arm64.tar.gz -[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha -[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-x64.deb -[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-x64.deb.sha +[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-x64.rpm -[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-x64.rpm.sha +[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.rpm.sha -[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-rhel.6-x64.tar.gz -[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-musl-x64.tar.gz -[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.6xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha +[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha # Debian daily feed @@ -216,5 +216,3 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). - - From c84ca182aa1717d8811e81f5f54163395607ee71 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 15 May 2019 13:01:16 -0700 Subject: [PATCH 032/896] Update build name for 2.1.7xx branch. --- build/Branding.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Branding.props b/build/Branding.props index 9d4cd474c568..62d24d22b45f 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - cli216xx + cli217xx Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime 2.1.0 - Preview From c2d5fa57784fc399ccda70bda69a606f07b56dc6 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 15 May 2019 16:45:35 -0700 Subject: [PATCH 033/896] Update branch reference in README to release/2.1.8xx. --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 666a403c7b15..eea146f17d5f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v2.0 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the release/2.1.7xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.1.8xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core Found an issue? @@ -65,7 +65,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). > In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with. -| Platform | Latest Daily Build
*release/2.1.7xx*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.1.8xx*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -76,7 +76,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | | **Linux-musl** | [tar.gz][linux-musl-targz] - [Checksum][linux-musl-targz-checksum] | -| Latest Coherent Build2
*release/2.1.7xx* | +| Latest Coherent Build2
*release/2.1.8xx* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -84,47 +84,47 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/latest.coherent.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/latest.version +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/win_x64_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/win_x64_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/win_x64_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm.tar.gz -[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-arm.tar.gz.sha -[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm64.tar.gz -[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha -[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.deb -[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.deb.sha +[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.rpm -[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-x64.rpm.sha +[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-x64.rpm.sha -[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-rhel.6-x64.tar.gz -[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-musl-x64.tar.gz -[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.7xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha +[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.8xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha # Debian daily feed From 62b778c1d9f98e4b94567660ab4efedbb762d0b2 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 15 May 2019 16:45:49 -0700 Subject: [PATCH 034/896] Update build name for release/2.1.8xx branch. --- build/Branding.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Branding.props b/build/Branding.props index 62d24d22b45f..84457aca3c8e 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - cli217xx + cli218xx Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime 2.1.0 - Preview From 1475140b26e70289b1e5cefcea7a199ac86aa2d0 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 15 May 2019 17:34:20 -0700 Subject: [PATCH 035/896] Update Roslyn to 3.1.0-beta4-19265-02 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 528827ececeb..4fedf0833823 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19253.3 - 3.1.0-beta4-19261-04 + 3.1.0-beta4-19265-02 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 1d473354f0ad2d480515dcc81fc6762e699180bd Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 16 May 2019 09:44:10 -0700 Subject: [PATCH 036/896] Update Roslyn to 3.2.0-beta1-19266-05. This commit updates Roslyn to `3.2.0-beta1-19266-05`. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4d0fab564748..a8bb7c277aa1 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19253.3 - 3.2.0-beta1-19263-09 + 3.2.0-beta1-19266-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 4ca3c67449c43ea65a6ea4b6dc11c9e95ac9ecee Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 20 May 2019 14:09:22 -0700 Subject: [PATCH 037/896] Update branding to 2.1.701 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 1e2c0c6f2582..25c07dd1bbbc 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 700 + 701 preview $(VersionMajor).$(VersionMinor) From 132f86cc0dca8496c502ff19dbf36722e23e964a Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 22 May 2019 13:57:27 -0700 Subject: [PATCH 038/896] Update NuGet to 5.2.0-preview2.6020 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a8bb7c277aa1..decd6d2b0a36 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.1.0-rtm.6013 + 5.2.0-preview2.6020 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From f3bac049f0ff7dba1ae3500892da511e454eb202 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 5 Jun 2019 10:27:28 -0700 Subject: [PATCH 039/896] Updating MSBuild and Roslyn --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index decd6d2b0a36..2c63d66297c9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,13 +12,13 @@ 2.1.1 2.1.11 $(MicrosoftNETCoreAppPackageVersion) - 16.2.0-preview.19264.2 + 16.2.0-preview-19274-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.4.3-beta.19253.3 - 3.2.0-beta1-19266-05 + 3.2.0-beta2-19303-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From b746d4c9745e70979aa48a56f6d863e72e0abef0 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 5 Jun 2019 17:15:00 -0700 Subject: [PATCH 040/896] Updating SDK to 2.1.800-preview-64205-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2c63d66297c9..23dd00aba57e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.700-preview-64109-02 + 2.1.800-preview-64205-01 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 1a43b30da92fa34916b4772b844828326d04c197 Mon Sep 17 00:00:00 2001 From: jagarg Date: Thu, 6 Jun 2019 11:46:05 +0530 Subject: [PATCH 041/896] Tp insertion 16.1.1 to 16.1 servicing branch --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4fedf0833823..1769cb4aefdc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -53,7 +53,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 16.1.0 + 16.1.1 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From d1311edbb4d1118243d3f1dcc322b3c16ca22401 Mon Sep 17 00:00:00 2001 From: Vagisha Nidhi Date: Mon, 10 Jun 2019 10:16:04 +0530 Subject: [PATCH 042/896] Updating TP version to 16.2 preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 23dd00aba57e..e9448de3c57e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -53,7 +53,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 16.1.0 + 16.2.0-preview-20190606-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From f368320f9933151a3c45e4261c857b5c0d40b681 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 11 Jun 2019 16:05:45 -0700 Subject: [PATCH 043/896] Insert NuGet Build 5.2.0-preview2.6045 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e9448de3c57e..890c2f77f5ac 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.2.0-preview2.6020 + 5.2.0-preview2.6045 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 082b2f75a984a5958a3cd136d8f7014dc9940fcd Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 14 Jun 2019 11:07:47 -0700 Subject: [PATCH 044/896] Updating SDK to 2.1.800-preview-64213-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 890c2f77f5ac..51543f8f3431 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.800-preview-64205-01 + 2.1.800-preview-64213-01 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 4c3f35f536a7375d2606264f32d12207819c7394 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 18 Jun 2019 14:27:58 -0700 Subject: [PATCH 045/896] Update MSBuild to 16.2.0-preview-19318-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 51543f8f3431..85d28539820b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.11 $(MicrosoftNETCoreAppPackageVersion) - 16.2.0-preview-19274-03 + 16.2.0-preview-19318-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 35c080940609f31d9821d82d31925f0d9d4dc31e Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 27 Jun 2019 11:55:11 -0700 Subject: [PATCH 046/896] Updating msbuild to 16.2.0-preview-19310-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 85d28539820b..0d6eed0a4104 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.11 $(MicrosoftNETCoreAppPackageVersion) - 16.2.0-preview-19318-05 + 16.2.0-preview-19310-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 4e7c8a97d3f17d70a4ea4d87096d8396f4a4e6c6 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 28 Jun 2019 12:15:24 -0700 Subject: [PATCH 047/896] Insert NuGet Build 5.2.0-rtm.6067 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 85d28539820b..145429d9c39c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -43,7 +43,7 @@ 1.3.2-preview.19074.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-63027-01 - 5.2.0-preview2.6045 + 5.2.0-rtm.6067 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 711112c824688ce207a9c088881da104ff1265a7 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 28 Jun 2019 16:06:03 -0700 Subject: [PATCH 048/896] Update MSBuild to 16.2.32702 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0d6eed0a4104..c0b39edd5847 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.11 $(MicrosoftNETCoreAppPackageVersion) - 16.2.0-preview-19310-01 + 16.2.32702 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 4c28d66cbd3c8079d4b031beaeb574e14a5c9928 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 28 Jun 2019 18:11:51 -0700 Subject: [PATCH 049/896] Update SDK to 2.1.800-preview-64229-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 27a602f53746..8491632b30b1 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.800-preview-64213-01 + 2.1.800-preview-64229-01 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.500 From 1aeab25a3ccda2c3fefe8ff99cf33020d19b2088 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 9 Jul 2019 21:45:03 +0000 Subject: [PATCH 050/896] Update aspnet, coresetup to servicing-31150, preview1-26216-03, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1769cb4aefdc..a263a69ab241 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.11 + 2.1.12 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.1 2.1.3 @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.11 + 2.1.12 $(MicrosoftNETCoreAppPackageVersion) 16.1.76 $(MicrosoftBuildPackageVersion) From 0672eaa49f465f58bd312aa1bb733692dbef0e37 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 9 Jul 2019 17:05:23 -0700 Subject: [PATCH 051/896] Update branding to 2.1.509. --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index d807657a8b7d..387ee92d337a 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 508 + 509 preview $(VersionMajor).$(VersionMinor) From 85454b3a5b5335139d4f062897703fd5a29a9f2b Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Fri, 12 Jul 2019 12:28:20 -0700 Subject: [PATCH 052/896] Update 1.x servicing versions to the latest versions. The 1.x servicing version numbers were stale and not the latest (and final) released versions. --- build/MSBuildExtensions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index b5114d02f855..08421da60dd3 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -163,8 +163,8 @@ - 1.0.15 - 1.1.12 + 1.0.16 + 1.1.13 2.0.9 From ec27125f3ccc7e1ec9de782bdb8a4d77a39141e0 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Fri, 12 Jul 2019 13:42:57 -0700 Subject: [PATCH 053/896] Update branding to 2.1.801. --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 5355aedba8bc..7e4607666c80 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 800 + 801 preview $(VersionMajor).$(VersionMinor) From c70799c22739595e27d002778f405c01305cb74e Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 15 Jul 2019 14:17:37 -0700 Subject: [PATCH 054/896] Update 1.x servicing versions to the latest versions. The 1.x servicing version numbers were stale and not the latest (and final) released versions. --- build/MSBuildExtensions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 73b6f88a2aee..2c1e3b7331e7 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -163,8 +163,8 @@ - 1.0.14 - 1.1.11 + 1.0.16 + 1.1.13 2.0.9 From 245e177c443328f37c59a4f7bc1d9fe9f169a0e2 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 31 Jul 2019 15:31:15 -0700 Subject: [PATCH 055/896] Updating branding to 2.1.802 (#12086) --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 7e4607666c80..20e20978cdc2 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 801 + 802 preview $(VersionMajor).$(VersionMinor) From 6fa609bedbcdfcdca806d20364c480451f6c18b1 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 13 Aug 2019 11:01:45 -0700 Subject: [PATCH 056/896] Updating msbuild to 16.2.37902 This is the version currently inserted into VS 16.2. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 986ff97f6c71..5251b486aaa8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.1 2.1.12 $(MicrosoftNETCoreAppPackageVersion) - 16.2.32702 + 16.2.37902 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 0b0c168761359504b814d45b89f7f8f0c2977728 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 10 Sep 2019 22:07:25 +0000 Subject: [PATCH 057/896] Update aspnet, coresetup to servicing-31150, preview1-26216-03, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5251b486aaa8..faba15130e0a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.12 + 2.1.13 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.1 2.1.3 @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.12 + 2.1.13 $(MicrosoftNETCoreAppPackageVersion) 16.2.37902 $(MicrosoftBuildPackageVersion) From 9344a588c1b9ed061009e60253f297198641835a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 10 Sep 2019 22:07:45 +0000 Subject: [PATCH 058/896] Update aspnet, coresetup to servicing-31150, preview1-26216-03, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e01a8ce001b1..2b94948ef603 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.12 + 2.1.13 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.1 2.1.3 @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.12 + 2.1.13 $(MicrosoftNETCoreAppPackageVersion) 15.9.20 $(MicrosoftBuildPackageVersion) From d0fc33cb82b93a5891576739e911d2be57b8f566 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 10 Sep 2019 22:07:50 +0000 Subject: [PATCH 059/896] Update aspnet, coresetup to servicing-31150, preview1-26216-03, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 430eef7f1998..3bf970ec0b7c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.12 + 2.1.13 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.1 2.1.3 @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.12 + 2.1.13 $(MicrosoftNETCoreAppPackageVersion) 16.0.450 $(MicrosoftBuildPackageVersion) From de9115962ca24b8cb064c69e3dbb272586f32a21 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 24 Jul 2019 23:33:27 +0000 Subject: [PATCH 060/896] Update Microsoft.DotNet.Web.Spa.ProjectTemplates to Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1 --- build/BundledTemplates.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index c38a969a424d..89ecac54ed76 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -6,7 +6,7 @@ - + From d45e915be3a8d94953a90188aac9155ae5fc9d7f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 24 Jul 2019 23:33:42 +0000 Subject: [PATCH 061/896] Update Microsoft.DotNet.Web.Spa.ProjectTemplates to Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1 --- build/BundledTemplates.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index c38a969a424d..89ecac54ed76 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -6,7 +6,7 @@ - + From 655856483535c142888a5592236795f717cbc53b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 24 Jul 2019 23:33:57 +0000 Subject: [PATCH 062/896] Update Microsoft.DotNet.Web.Spa.ProjectTemplates to Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1 --- build/BundledTemplates.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index c38a969a424d..89ecac54ed76 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -6,7 +6,7 @@ - + From 64bfc9124c3f5194aaed7a493524f1208ec388c0 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 2 Oct 2019 15:33:27 -0700 Subject: [PATCH 063/896] Updating branding to 2.1.510 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 387ee92d337a..1a3ced074107 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 509 + 510 preview $(VersionMajor).$(VersionMinor) From 3f296dceab7f0f216e952757b08a4e010158eb84 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 2 Oct 2019 15:39:29 -0700 Subject: [PATCH 064/896] Update branding to 2.1.607 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index d92547dbe72e..8cdd4b63fd44 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 606 + 607 preview $(VersionMajor).$(VersionMinor) From df70c6c6feea2d33778980c777527c47e55801ac Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 10 Oct 2019 08:13:35 -0700 Subject: [PATCH 065/896] Switch to correct SHA2 cert (#12855) (#12859) SHA1 certs were deprecated and removed from ESRP. Move to the correct cert for external assemblies --- build/Signing.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Signing.proj b/build/Signing.proj index f77406db0170..329c15c44c2d 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -5,7 +5,7 @@ true - 135020001 + 135020002 Microsoft402 NuGet From 4ad6540df141c789afba79bf52ee317e3cc86855 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 15 Oct 2019 13:31:05 -0700 Subject: [PATCH 066/896] Fix merge of README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 448e32ec9596..caf72eedd61a 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). > In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with. -| Platform | Latest Daily Build
*release/2.1.6xx*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.2.4xx*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | From c7b136fd5ac345856deefb159d90f798aed74558 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 15 Oct 2019 22:20:14 -0700 Subject: [PATCH 067/896] Fix eventProperties.Add mutate _commonProperties --- src/dotnet/Telemetry/Telemetry.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/dotnet/Telemetry/Telemetry.cs b/src/dotnet/Telemetry/Telemetry.cs index e204fd19eb56..ae58897f88e4 100644 --- a/src/dotnet/Telemetry/Telemetry.cs +++ b/src/dotnet/Telemetry/Telemetry.cs @@ -178,19 +178,16 @@ private Dictionary GetEventMeasures(IDictionary private Dictionary GetEventProperties(IDictionary properties) { + var eventProperties = new Dictionary(_commonProperties); if (properties != null) { - var eventProperties = new Dictionary(_commonProperties); foreach (KeyValuePair property in properties) { eventProperties[property.Key] = property.Value; } - return eventProperties; - } - else - { - return _commonProperties; } + + return eventProperties; } } } From 6e4e8182c7a005729b4232b10dda6428c86f40e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 16:52:24 +0000 Subject: [PATCH 068/896] Update dependencies from https://github.com/dotnet/core-setup build 20191016.1 (#12904) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19516.1 - Microsoft.NET.HostModel - 3.1.0-preview2.19516.1 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19516.1 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19516.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19516.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19516.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fbcccd635bc..147933827468 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a diff --git a/eng/Versions.props b/eng/Versions.props index a9faf88d672a..d1bb1355c1fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 From ece3047c307eef54bca383662cda315d6d4ee23a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 00:50:28 +0000 Subject: [PATCH 069/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191016.9 (#12908) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19516.9 --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index cce6507a1e2d..971a1bc36de9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1678a23197a..e3b369d52be1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx bedb348c4d93b6172967df6cdeea0272c81eb752 - + https://github.com/aspnet/AspNetCore - c36b12bd5f139bb6b363557efdd25a19651bf642 + 5ceb94f3fe9462afc2e730e94d0a2fb59b8aaae3 diff --git a/eng/Versions.props b/eng/Versions.props index 7e785af3ee30..592fa1bb5a9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.0.1-servicing.19503.9 + 3.0.1-servicing.19516.9 From 9ab8ebd60375c33c2e10399f208eb50de84c4a1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 03:50:25 +0000 Subject: [PATCH 070/896] Update dependencies from https://github.com/dotnet/core-setup build 20191016.15 (#12909) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19516.15 - Microsoft.NET.HostModel - 3.1.0-preview2.19516.15 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19516.15 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19516.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19516.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19516.15 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19516.11 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 147933827468..f35d341dd9fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 - + https://github.com/dotnet/corefx - d6156966c01a8a45a069fecdc68c162f94d9d58d + 28875ae9ab97fe20b63444cc335db94f1b9ccb52 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index d1bb1355c1fa..7df4b11ecda6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.15 From 5363e0119503e08b40eea53ff85b02839a86fa44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 08:00:27 +0000 Subject: [PATCH 071/896] Update dependencies from https://github.com/dotnet/core-setup build 20191016.18 (#12911) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19516.18 - Microsoft.NET.HostModel - 3.1.0-preview2.19516.18 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19516.18 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19516.18 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19516.18 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19516.18 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19516.15 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f35d341dd9fa..5a8087490a17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/core-setup - 5cf43118651b9b8ab3d7e61134a1c0e14ba75e27 + 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 - + https://github.com/dotnet/corefx - 28875ae9ab97fe20b63444cc335db94f1b9ccb52 + c4d092f0430a104fa633f1503a1c207b4518f05d https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7df4b11ecda6..1339cce5a927 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19516.15 - 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.18 + 3.1.0-preview2.19516.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19516.15 - 3.1.0-preview2.19516.15 - 3.1.0-preview2.19516.15 - 3.1.0-preview2.19516.15 + 3.1.0-preview2.19516.18 + 3.1.0-preview2.19516.18 + 3.1.0-preview2.19516.18 + 3.1.0-preview2.19516.18 From 63d713b7751a7c93488930fabb4f2fff85d1602d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 14:14:32 +0000 Subject: [PATCH 072/896] Update dependencies from https://github.com/dotnet/core-setup build 20191016.12 (#12914) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 - Microsoft.NET.HostModel - 3.0.1 - Microsoft.DotNet.PlatformAbstractions - 3.0.1 - Microsoft.Extensions.DependencyModel - 3.0.1 Dependency coherency updates - System.Text.Json - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 971a1bc36de9..f45b6d82af9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,9 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3b369d52be1..1303b6fce0a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,29 +11,29 @@ https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/corefx - bedb348c4d93b6172967df6cdeea0272c81eb752 + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/aspnet/AspNetCore From c8ccefdbcd4ba7faf1eee00c3d3b6358c8778a51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 20:45:31 +0000 Subject: [PATCH 073/896] Update dependencies from https://github.com/dotnet/core-setup build 20191017.4 (#12916) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19517.4 - Microsoft.NET.HostModel - 3.1.0-preview2.19517.4 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19517.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19517.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19517.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19517.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a8087490a17..170817a26497 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb - + https://github.com/dotnet/core-setup - 7eeb5cdcc5bddb9588b406e3cdd924e9ff3dd192 + 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb diff --git a/eng/Versions.props b/eng/Versions.props index 1339cce5a927..37c2da139806 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19516.18 - 3.1.0-preview2.19516.18 + 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19516.18 - 3.1.0-preview2.19516.18 - 3.1.0-preview2.19516.18 - 3.1.0-preview2.19516.18 + 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.4 From 973a51de880fe7a0fa170c551e60a1042bee2a3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 22:14:28 +0000 Subject: [PATCH 074/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.3.1.6268 (#12917) - NuGet.Build.Tasks - 5.3.1-rtm.6268 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1303b6fce0a0..b303e316810b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,9 +55,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - b75150f2f4127a77a166c9552845e86fb24a3282 + f2c670b0b7cdc018dc708666b2d58699d9654e42 diff --git a/eng/Versions.props b/eng/Versions.props index 592fa1bb5a9f..9e08957d5f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.3.0-rtm.6251 + 5.3.1-rtm.6268 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 7903b70ae07d30157a9f1309df6570dd9c60034e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 23:25:26 +0000 Subject: [PATCH 075/896] Update dependencies from https://github.com/dotnet/core-setup build 20191017.5 (#12918) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19517.5 - Microsoft.NET.HostModel - 3.1.0-preview2.19517.5 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19517.5 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19517.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19517.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19517.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 170817a26497..21f4ce0bb546 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 - + https://github.com/dotnet/core-setup - 78df3ddd8b40fbd93e10cea111b840c3ecfbb9fb + 7982be53f1c59c813d8157e9cf1f84e1b36f8478 diff --git a/eng/Versions.props b/eng/Versions.props index 37c2da139806..3539326d0fac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19517.4 - 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19517.4 - 3.1.0-preview2.19517.4 - 3.1.0-preview2.19517.4 - 3.1.0-preview2.19517.4 + 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.5 From bc810ec35c5cedc82f846e822d5d4e8d648c6359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 08:15:30 +0000 Subject: [PATCH 076/896] Update dependencies from https://github.com/dotnet/core-setup build 20191017.10 (#12920) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19517.10 - Microsoft.NET.HostModel - 3.1.0-preview2.19517.10 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19517.10 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19517.10 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19517.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19517.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21f4ce0bb546..c84bbb1c33e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - 7982be53f1c59c813d8157e9cf1f84e1b36f8478 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 diff --git a/eng/Versions.props b/eng/Versions.props index 3539326d0fac..1e2a668dfb94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19517.5 - 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19517.5 - 3.1.0-preview2.19517.5 - 3.1.0-preview2.19517.5 - 3.1.0-preview2.19517.5 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 From 9a07fad357adc090db1c71b42176bd79098b3466 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 08:35:30 +0000 Subject: [PATCH 077/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191017.21 (#12921) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19517.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c84bbb1c33e6..8259abe0c348 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx c4d092f0430a104fa633f1503a1c207b4518f05d - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 5440cd319d3144db070dee28e72386e3a432bc0c diff --git a/eng/Versions.props b/eng/Versions.props index 1e2a668dfb94..324cb88f55e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview1.19508.20 + 3.1.0-preview2.19517.21 From c5dda6d6d8a7aedd0d84584427a45438b005ad51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 22:50:50 +0000 Subject: [PATCH 078/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191018.2 (#12922) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19518.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8259abe0c348..56c55bc6a09c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx c4d092f0430a104fa633f1503a1c207b4518f05d - + https://github.com/aspnet/AspNetCore - 5440cd319d3144db070dee28e72386e3a432bc0c + c298c94fe1113b64474a3d5fcdef487f02c74991 diff --git a/eng/Versions.props b/eng/Versions.props index 324cb88f55e3..4d6cf737cc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19517.21 + 3.1.0-preview2.19518.2 From 7e9a50b73ffd1c731a252f6f6dcd51c588ed64ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 00:25:41 +0000 Subject: [PATCH 079/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191018.3 (#12924) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19518.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56c55bc6a09c..23ac144b21d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx c4d092f0430a104fa633f1503a1c207b4518f05d - + https://github.com/aspnet/AspNetCore - c298c94fe1113b64474a3d5fcdef487f02c74991 + 19718f6011b9d0124e805af61584fda934a6f982 diff --git a/eng/Versions.props b/eng/Versions.props index 4d6cf737cc2c..3f0843e8b883 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19518.2 + 3.1.0-preview2.19518.3 From 33209a8efbd3672d5595d23eb07d6d6d7ec992b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 01:20:24 +0000 Subject: [PATCH 080/896] Update dependencies from https://github.com/dotnet/core-setup build 20191018.8 (#12926) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19518.8 - Microsoft.NET.HostModel - 3.1.0-preview2.19518.8 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19518.8 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19518.8 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19518.8 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19518.8 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19518.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23ac144b21d5..f3119f35799a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 + 3a78795f4d10a6a23af378116cabf429efefea88 - + https://github.com/dotnet/corefx - c4d092f0430a104fa633f1503a1c207b4518f05d + 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 3f0843e8b883..4c4d0caf8ca7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 + 3.1.0-preview2.19518.8 + 3.1.0-preview2.19518.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 + 3.1.0-preview2.19518.8 + 3.1.0-preview2.19518.8 + 3.1.0-preview2.19518.8 + 3.1.0-preview2.19518.8 From 7849d3a3f33e03123bdaa7d10f1d6565a94c0167 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 03:00:23 +0000 Subject: [PATCH 081/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191018.4 (#12928) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19518.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3119f35799a..d32a35e97719 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 65585c13f17de7222763a0b6282b4e83c15eb188 diff --git a/eng/Versions.props b/eng/Versions.props index 4c4d0caf8ca7..c91bd7c2179f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.4 From 02b2e3bbf05b667a99bfbe66e70a5615eadefb82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 06:20:26 +0000 Subject: [PATCH 082/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191018.6 (#12930) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19518.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d32a35e97719..7377622fc013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 - + https://github.com/aspnet/AspNetCore - 65585c13f17de7222763a0b6282b4e83c15eb188 + 3d3d5f699e0b7efb59b7133bde92eac1f1799318 diff --git a/eng/Versions.props b/eng/Versions.props index c91bd7c2179f..637268374d4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19518.4 + 3.1.0-preview2.19518.6 From 439f9ba586dee930f1cd1e215b530b8c69191580 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 08:45:24 +0000 Subject: [PATCH 083/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191018.8 (#12932) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19518.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7377622fc013..531348f6246f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 - + https://github.com/aspnet/AspNetCore - 3d3d5f699e0b7efb59b7133bde92eac1f1799318 + a1fea2015777954c282a226339824874fe42c569 diff --git a/eng/Versions.props b/eng/Versions.props index 637268374d4b..f86a429db425 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19518.6 + 3.1.0-preview2.19518.8 From fb10c92ab26eb8bb709e591e01c3219f1a1db7eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2019 04:45:23 +0000 Subject: [PATCH 084/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191019.2 (#12946) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19519.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 531348f6246f..5307f0d17966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 - + https://github.com/aspnet/AspNetCore - a1fea2015777954c282a226339824874fe42c569 + 0de57914279da79eb7166588f67609c851e46179 diff --git a/eng/Versions.props b/eng/Versions.props index f86a429db425..c7d0da86fb28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19518.8 + 3.1.0-preview2.19519.2 From 08f2a44fd1a2ca4363b656c730123370f4f91942 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2019 21:40:28 +0000 Subject: [PATCH 085/896] Update dependencies from https://github.com/dotnet/core-setup build 20191021.7 (#12953) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.7 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.7 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.7 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5307f0d17966..0827a40497b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 - + https://github.com/dotnet/core-setup - 3a78795f4d10a6a23af378116cabf429efefea88 + 763532fc5b6003b7aedc2d9b587411a6826e30e1 diff --git a/eng/Versions.props b/eng/Versions.props index c7d0da86fb28..0c26910a2d3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19518.8 - 3.1.0-preview2.19518.8 + 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19518.8 - 3.1.0-preview2.19518.8 - 3.1.0-preview2.19518.8 - 3.1.0-preview2.19518.8 + 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.7 From 68142f6223ca9a2e42f664c886e0de5a8168b618 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 01:57:44 +0000 Subject: [PATCH 086/896] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#12952) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191021.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19521.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191021.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19521.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0827a40497b1..a742c2f30904 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 - + https://github.com/aspnet/AspNetCore - 0de57914279da79eb7166588f67609c851e46179 + c1389d79af44fa1f05d9ef8345173db93b821fdb diff --git a/eng/Versions.props b/eng/Versions.props index 0c26910a2d3a..833f6a341f08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19519.2 + 3.1.0-preview2.19521.6 From 2587594401dbe53bb0a0f7acae61a2ec7df6b120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 04:27:29 +0000 Subject: [PATCH 087/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#12954) * Update dependencies from https://github.com/dotnet/core-setup build 20191021.9 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.9 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.9 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.9 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.9 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.9 * Update dependencies from https://github.com/dotnet/core-setup build 20191021.11 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.11 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.11 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.11 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.11 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.11 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.11 * Update dependencies from https://github.com/dotnet/core-setup build 20191021.13 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.13 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.13 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.13 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.13 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.13 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19521.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a742c2f30904..6c287185f9b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/core-setup - 763532fc5b6003b7aedc2d9b587411a6826e30e1 + 93b469074cd73445634feeb0032f7fcb75ef4bfb - + https://github.com/dotnet/corefx - 58dbf71fd0d9593c4bf8a1ecb2d5d4ff6882e782 + f36f5deb932a1b8f0c7985bcc7214386ba1c2057 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 833f6a341f08..10782a0b806b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19521.7 - 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.13 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19521.7 - 3.1.0-preview2.19521.7 - 3.1.0-preview2.19521.7 - 3.1.0-preview2.19521.7 + 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.13 From 6cbead69f2d54e9c13beeed4c3250f3884bda12a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 06:15:25 +0000 Subject: [PATCH 088/896] Update dependencies from https://github.com/dotnet/core-setup build 20191021.15 (#12956) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.15 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.15 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.15 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.15 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c287185f9b6..a56d21ad1383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 - + https://github.com/dotnet/core-setup - 93b469074cd73445634feeb0032f7fcb75ef4bfb + f830769364b45286b638a57176d4a7997dbc5237 diff --git a/eng/Versions.props b/eng/Versions.props index 10782a0b806b..42eaadfd72b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19521.13 - 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.15 + 3.1.0-preview2.19521.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19521.13 - 3.1.0-preview2.19521.13 - 3.1.0-preview2.19521.13 - 3.1.0-preview2.19521.13 + 3.1.0-preview2.19521.15 + 3.1.0-preview2.19521.15 + 3.1.0-preview2.19521.15 + 3.1.0-preview2.19521.15 From c2aef013a10ac60b9349c9a895b06eb7a9ee0172 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 12:11:38 +0000 Subject: [PATCH 089/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#12958) * Update dependencies from https://github.com/dotnet/core-setup build 20191021.17 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19521.17 - Microsoft.NET.HostModel - 3.1.0-preview2.19521.17 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19521.17 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19521.17 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19521.17 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19521.17 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19521.15 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191022.1 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19522.1 - Microsoft.NET.HostModel - 3.1.0-preview2.19522.1 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19522.1 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19522.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19522.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19522.1 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19521.18 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a56d21ad1383..ab3eeedf23d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/core-setup - f830769364b45286b638a57176d4a7997dbc5237 + 9354e1f42890a9deb5d52ca65b0313c707d89ed5 - + https://github.com/dotnet/corefx - f36f5deb932a1b8f0c7985bcc7214386ba1c2057 + b187a7f11b42476863c791b4ffe94e1bd8c093be https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 42eaadfd72b2..f51350fc356a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19521.15 - 3.1.0-preview2.19521.15 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19521.15 - 3.1.0-preview2.19521.15 - 3.1.0-preview2.19521.15 - 3.1.0-preview2.19521.15 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 From 4155067ad39260a8d52ecdeff55df0853c0674b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 20:50:29 +0000 Subject: [PATCH 090/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191022.3 (#12964) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19522.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab3eeedf23d6..c44caa8cac2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx b187a7f11b42476863c791b4ffe94e1bd8c093be - + https://github.com/aspnet/AspNetCore - c1389d79af44fa1f05d9ef8345173db93b821fdb + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 diff --git a/eng/Versions.props b/eng/Versions.props index f51350fc356a..cf9834faa3ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19521.6 + 3.1.0-preview2.19522.3 From a057a184a8207ca666e3e3a838111cf35148d635 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 21:53:10 +0000 Subject: [PATCH 091/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.4.0.6271 (#12965) - NuGet.Build.Tasks - 5.4.0-preview.3.6271 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c44caa8cac2d..7bc4c450cb0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,9 +55,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - b75150f2f4127a77a166c9552845e86fb24a3282 + c1f6915918b82c096bbd666bd9c18528f1f70630 diff --git a/eng/Versions.props b/eng/Versions.props index cf9834faa3ce..814cbd16a619 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.3.0-rtm.6251 + 5.4.0-preview.3.6271 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 6df78064460c204cb2d4ac7ff94ead68e27507fc Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 22 Oct 2019 20:04:56 -0700 Subject: [PATCH 092/896] Fix mark of the web (#12955) --- .../DangerousFileDetector.cs | 29 +++++++++++------ .../DangerousFileDetectorTests.cs | 32 +++++++++++++++++-- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/DangerousFileDetector.cs b/src/Microsoft.DotNet.Cli.Utils/DangerousFileDetector.cs index 5db5835d4266..3dbc53af92a7 100644 --- a/src/Microsoft.DotNet.Cli.Utils/DangerousFileDetector.cs +++ b/src/Microsoft.DotNet.Cli.Utils/DangerousFileDetector.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Runtime.InteropServices; using Microsoft.DotNet.PlatformAbstractions; using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment; @@ -28,23 +29,33 @@ private static class InternetSecurity private const uint ZoneTrusted = 2; private const uint ZoneInternet = 3; private const uint ZoneUntrusted = 4; + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); private static IInternetSecurityManager internetSecurityManager = null; public static bool IsDangerous(string filename) { - // First check the zone, if they are not an untrusted zone, they aren't dangerous - if (internetSecurityManager == null) + try { - Type iismType = Type.GetTypeFromCLSID(new Guid(CLSID_InternetSecurityManager)); - internetSecurityManager = (IInternetSecurityManager)Activator.CreateInstance(iismType); + // First check the zone, if they are not an untrusted zone, they aren't dangerous + if (internetSecurityManager == null) + { + Type iismType = Type.GetTypeFromCLSID(new Guid(CLSID_InternetSecurityManager)); + internetSecurityManager = (IInternetSecurityManager)Activator.CreateInstance(iismType); + } + int zone = 0; + internetSecurityManager.MapUrlToZone(Path.GetFullPath(filename), out zone, 0); + if (zone < ZoneInternet) + { + return false; + } + // By default all file types that get here are considered dangerous + return true; } - int zone = 0; - internetSecurityManager.MapUrlToZone(Path.GetFullPath(filename), out zone, 0); - if (zone < ZoneInternet) + catch (COMException ex) when (ex.ErrorCode == REGDB_E_CLASSNOTREG) { + // When the COM is missing(Class not registered error), it is in a locked down + // version like Nano Server return false; } - // By default all file types that get here are considered dangerous - return true; } } } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/DangerousFileDetectorTests.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/DangerousFileDetectorTests.cs index bc6b5ecafc02..60a91e710b90 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/DangerousFileDetectorTests.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/DangerousFileDetectorTests.cs @@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Cli.Utils.Tests { public class DangerousFileDetectorTests : TestBase { + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); + [WindowsOnlyFact] public void ItShouldDetectFileWithMarkOfTheWeb() { @@ -24,7 +26,15 @@ public void ItShouldDetectFileWithMarkOfTheWeb() "Zone.Identifier", "[ZoneTransfer]\r\nZoneId=3\r\nReferrerUrl=C:\\Users\\test.zip\r\n"); - new DangerousFileDetector().IsDangerous(testFile).Should().BeTrue(); + bool isTestFileDangerous = new DangerousFileDetector().IsDangerous(testFile); + if (!HasInternetSecurityManagerNativeApi()) + { + isTestFileDangerous.Should().BeFalse("Locked down version of Windows does not have IE to download files"); + } + else + { + isTestFileDangerous.Should().BeTrue(); + } } [Fact] @@ -44,6 +54,24 @@ public void WhenRunOnNonWindowsReturnFalse() new DangerousFileDetector().IsDangerous(testFile).Should().BeFalse(); } + private static bool HasInternetSecurityManagerNativeApi() + { + try + { + string CLSID_InternetSecurityManager = "7b8a2d94-0ac9-11d1-896c-00c04fb6bfc4"; + + Type iismType = Type.GetTypeFromCLSID(new Guid(CLSID_InternetSecurityManager)); + var internetSecurityManager = (IInternetSecurityManager)Activator.CreateInstance(iismType); + return true; + } + catch (COMException ex) when (ex.ErrorCode == REGDB_E_CLASSNOTREG) + { + // When the COM is missing(Class not registered error), it is in a locked down + // version like Nano Server + return false; + } + } + private static class AlternateStream { private const uint GenericWrite = 0x40000000; @@ -91,7 +119,7 @@ SafeFileHandle fileHandle } } - [DllImport("kernel32", SetLastError = true)] + [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)] private static extern SafeFileHandle CreateFile( string filename, uint desiredAccess, From fec43d22c486a8e312811cc769e320a62d86c552 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 06:17:01 +0000 Subject: [PATCH 093/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#12968) * Update dependencies from https://github.com/dotnet/core-setup build 20191022.7 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19522.7 - Microsoft.NET.HostModel - 3.1.0-preview2.19522.7 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19522.7 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19522.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19522.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19522.7 * Update dependencies from https://github.com/dotnet/core-setup build 20191022.9 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19522.9 - Microsoft.NET.HostModel - 3.1.0-preview2.19522.9 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19522.9 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19522.9 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19522.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19522.9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bc4c450cb0b..9540340331f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 - + https://github.com/dotnet/core-setup - 9354e1f42890a9deb5d52ca65b0313c707d89ed5 + 8dc60d0132c062a8258969cdec05df9a258ea5b6 diff --git a/eng/Versions.props b/eng/Versions.props index 814cbd16a619..a9c1efd88635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19522.1 - 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.9 + 3.1.0-preview2.19522.9 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19522.1 - 3.1.0-preview2.19522.1 - 3.1.0-preview2.19522.1 - 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.9 + 3.1.0-preview2.19522.9 + 3.1.0-preview2.19522.9 + 3.1.0-preview2.19522.9 From 4a4bf4ff87550e477c9db6de808d430908450da8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 16:10:31 -0700 Subject: [PATCH 094/896] Update dependencies from https://github.com/dotnet/core-setup build 20191023.4 (#12970) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19523.4 - Microsoft.NET.HostModel - 3.1.0-preview2.19523.4 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19523.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19523.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19523.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19523.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9540340331f1..96b3ce418cb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 - + https://github.com/dotnet/core-setup - 8dc60d0132c062a8258969cdec05df9a258ea5b6 + 5cde584f489b0b4c558255ea484c5606eb494b98 diff --git a/eng/Versions.props b/eng/Versions.props index a9c1efd88635..28ae1357750c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19522.9 - 3.1.0-preview2.19522.9 + 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19522.9 - 3.1.0-preview2.19522.9 - 3.1.0-preview2.19522.9 - 3.1.0-preview2.19522.9 + 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.4 From 0cbb7c10737f961599f555ad68af6b6f4891038d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2019 03:06:54 +0000 Subject: [PATCH 095/896] Update dependencies from https://github.com/dotnet/core-setup build 20191023.6 (#12973) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19523.6 - Microsoft.NET.HostModel - 3.1.0-preview2.19523.6 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19523.6 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19523.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19523.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19523.6 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19522.18 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96b3ce418cb4..a11fa1e2c6f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/core-setup - 5cde584f489b0b4c558255ea484c5606eb494b98 + 10d8d0996dba48164eb035562afb32e8157e8d06 - + https://github.com/dotnet/corefx - b187a7f11b42476863c791b4ffe94e1bd8c093be + e342823f6e560b75164b8ab0be68246509f0b648 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 28ae1357750c..40ae6856a549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19523.4 - 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19523.4 - 3.1.0-preview2.19523.4 - 3.1.0-preview2.19523.4 - 3.1.0-preview2.19523.4 + 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.6 From 061f9cd2ac638420557a8b9be5c105fec78abee3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:50:06 -0700 Subject: [PATCH 096/896] Update dependencies from https://github.com/dotnet/core-setup build 20191023.11 (#12975) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19523.11 - Microsoft.NET.HostModel - 3.1.0-preview2.19523.11 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19523.11 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19523.11 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19523.11 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19523.11 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19523.16 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a11fa1e2c6f6..986edc208b50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/core-setup - 10d8d0996dba48164eb035562afb32e8157e8d06 + 925a7137c8d1387a3948ee36ffc90fc182b405a9 - + https://github.com/dotnet/corefx - e342823f6e560b75164b8ab0be68246509f0b648 + 92013f79e9f45b7f796af3481cccd2d39b964373 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 40ae6856a549..09559c7c0e14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19523.6 - 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.11 + 3.1.0-preview2.19523.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19523.6 - 3.1.0-preview2.19523.6 - 3.1.0-preview2.19523.6 - 3.1.0-preview2.19523.6 + 3.1.0-preview2.19523.11 + 3.1.0-preview2.19523.11 + 3.1.0-preview2.19523.11 + 3.1.0-preview2.19523.11 From db60cc51dbf2442013b6b2ae9d323339e80b2077 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2019 03:10:28 +0000 Subject: [PATCH 097/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191024.9 (#12978) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19524.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 986edc208b50..e683022e80c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 92013f79e9f45b7f796af3481cccd2d39b964373 - + https://github.com/aspnet/AspNetCore - 1ea47f119b25bd0c4c475ef444abf591d4b890f9 + 2f1029e3b0b783ad0f4b878f7356928106c10726 diff --git a/eng/Versions.props b/eng/Versions.props index 09559c7c0e14..2212f549d99d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19522.3 + 3.1.0-preview2.19524.9 From c3cce065adb627a490f54af09bccb290f9dce852 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 25 Oct 2019 14:50:31 -0700 Subject: [PATCH 098/896] Fix typo (#12972) --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 31cf5338c821..837493c8e04a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -11,6 +11,6 @@ + RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" /> - \ No newline at end of file + From b01c47d2008864d965c95fa5022049e46bd6abb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2019 15:42:53 -0700 Subject: [PATCH 099/896] Update dependencies from https://github.com/dotnet/cli build 20191025.3 (#3316) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19525.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f68d33b06e3d..1925894b181e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - 973a51de880fe7a0fa170c551e60a1042bee2a3b + c3cce065adb627a490f54af09bccb290f9dce852 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0971a934ee10..126e3f4edc87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19517.5 + 3.0.101-servicing.19525.3 From b62048418f55844174e72ec8d08f603d4bdcb9cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2019 22:45:35 +0000 Subject: [PATCH 100/896] Update dependencies from https://github.com/dotnet/sdk build 20191025.4 (#12984) - Microsoft.NET.Sdk - 3.1.100-preview2.19525.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e683022e80c6..d3ef5b246c52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 357126710492d620198a60ee340ebeca9070f133 + 5d0fe6572a2f7a11fe5eabdee4800002e111e726 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2212f549d99d..2c8584616d90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview1.19506.1 + 3.1.100-preview2.19525.4 $(MicrosoftNETSdkPackageVersion) From ebd7bc007a2fce0b98d84e3df2955a38e33e1083 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2019 18:28:41 -0700 Subject: [PATCH 101/896] Update dependencies from https://github.com/dotnet/core-setup build 20191025.6 (#12986) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19525.6 - Microsoft.NET.HostModel - 3.1.0-preview2.19525.6 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19525.6 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19525.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19525.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19525.6 Dependency coherency updates - System.Text.Json - 4.7.0-preview2.19523.17 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3ef5b246c52..82fe9df77c69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/core-setup - 925a7137c8d1387a3948ee36ffc90fc182b405a9 + 5672978d912db81b4b677fddff264907a47ec9a8 - + https://github.com/dotnet/corefx - 92013f79e9f45b7f796af3481cccd2d39b964373 + 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 2c8584616d90..2f959a53c0e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19523.11 - 3.1.0-preview2.19523.11 + 3.1.0-preview2.19525.6 + 3.1.0-preview2.19525.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19523.11 - 3.1.0-preview2.19523.11 - 3.1.0-preview2.19523.11 - 3.1.0-preview2.19523.11 + 3.1.0-preview2.19525.6 + 3.1.0-preview2.19525.6 + 3.1.0-preview2.19525.6 + 3.1.0-preview2.19525.6 From bf1e2512657f8ae0a6ac23aefe1445535a9beb16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2019 04:17:18 +0000 Subject: [PATCH 102/896] [release/3.1.1xx] Update dependencies from dotnet/sdk (#12985) * Update dependencies from https://github.com/dotnet/sdk build 20191025.5 - Microsoft.NET.Sdk - 3.1.100-preview2.19525.5 * Update dependencies from https://github.com/dotnet/sdk build 20191025.6 - Microsoft.NET.Sdk - 3.1.100-preview2.19525.6 * Update dependencies from https://github.com/dotnet/sdk build 20191025.7 - Microsoft.NET.Sdk - 3.1.100-preview2.19525.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82fe9df77c69..7552f5bfc0bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 5d0fe6572a2f7a11fe5eabdee4800002e111e726 + e48fd678f261a8e0aeb7a4a968b353f922f42a69 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2f959a53c0e5..cc68c32a2a36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19525.4 + 3.1.100-preview2.19525.7 $(MicrosoftNETSdkPackageVersion) From 55fc1ed9117b267b9f027c1fd92bbb2137cedd91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2019 10:15:25 +0000 Subject: [PATCH 103/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191025.8 (#12987) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19525.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7552f5bfc0bf..7f3d5e4d6ffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 2f1029e3b0b783ad0f4b878f7356928106c10726 + 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 diff --git a/eng/Versions.props b/eng/Versions.props index cc68c32a2a36..e8d39487dd8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19524.9 + 3.1.0-preview2.19525.8 From 4610f90b6a01dbccca1218b6280251f9e0547384 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 17:58:17 -0700 Subject: [PATCH 104/896] [release/3.1.1xx] Update dependencies from dotnet/sdk (#12988) * Update dependencies from https://github.com/dotnet/sdk build 20191027.1 - Microsoft.NET.Sdk - 3.1.100-preview2.19527.1 * Update dependencies from https://github.com/dotnet/sdk build 20191028.2 - Microsoft.NET.Sdk - 3.1.100-preview2.19528.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f3d5e4d6ffd..d57153c3f11f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - e48fd678f261a8e0aeb7a4a968b353f922f42a69 + 334812443d8bb11afa51a7efd2f8de83e321e6e1 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index e8d39487dd8f..6a2466a9d052 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19525.7 + 3.1.100-preview2.19528.2 $(MicrosoftNETSdkPackageVersion) From e8948e6af470851162615f60896261685bfc91d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 02:35:19 +0000 Subject: [PATCH 105/896] Update dependencies from https://github.com/dotnet/sdk build 20191028.5 (#3344) - Microsoft.NET.Sdk - 3.0.101-servicing.19528.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1925894b181e..22e6eab88383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli c3cce065adb627a490f54af09bccb290f9dce852 - + https://github.com/dotnet/sdk - dc6f52268517e279bc001aec4520585d9b040e41 + 2163fbce7a27c22ca133f7bce59781aac7ba6044 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 126e3f4edc87..c5eb5b1df25f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.0.101-servicing.19510.7 + 3.0.101-servicing.19528.5 From 5e24f5f28658db57967560cd5a12ed0b365e13f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 02:55:29 +0000 Subject: [PATCH 106/896] Update dependencies from https://github.com/dotnet/sdk build 20191028.5 (#12989) - Microsoft.NET.Sdk - 3.0.101-servicing.19528.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b303e316810b..51bc96f513ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 3819a21a612cd8bc15b6f6c4e361d18490469577 + 2163fbce7a27c22ca133f7bce59781aac7ba6044 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 9e08957d5f7e..42cc12717dd1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.0.101-servicing.19477.3 + 3.0.101-servicing.19528.5 $(MicrosoftNETSdkPackageVersion) From 23212e12c98ce4af8f07922c9ef6a20b23f236ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 07:40:27 +0000 Subject: [PATCH 107/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191028.8 (#12990) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview2.19528.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d57153c3f11f..ce9a57e63109 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 7ef5dd3af4868fcd69778c922b48e1f429fb0aa6 + 471e4710a818849eaf22c5977281d10fd6758616 diff --git a/eng/Versions.props b/eng/Versions.props index 6a2466a9d052..f60baa03caab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19525.8 + 3.1.0-preview2.19528.8 From 2aa5a83e6ee1bf5dc4986faf61c35d9798ed7b80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 17:35:27 +0000 Subject: [PATCH 108/896] Update dependencies from https://github.com/dotnet/sdk build 20191029.1 (#3350) - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e6eab88383..a8ae13b08aa6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli c3cce065adb627a490f54af09bccb290f9dce852 - + https://github.com/dotnet/sdk - 2163fbce7a27c22ca133f7bce59781aac7ba6044 + 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c5eb5b1df25f..e2da86b81f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.0.101-servicing.19528.5 + 3.0.101-servicing.19529.1 From aa188b4b7d61ce49e971377dff037c31918fca9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 18:55:31 +0000 Subject: [PATCH 109/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191028.7 (#12993) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19528.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51bc96f513ce..655bfd742883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/AspNetCore - 5ceb94f3fe9462afc2e730e94d0a2fb59b8aaae3 + 2c6456d4634df947e3cafd5e7dee02289dc12697 diff --git a/eng/Versions.props b/eng/Versions.props index 42cc12717dd1..b9037e357966 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.0.1-servicing.19516.9 + 3.0.1-servicing.19528.7 From 4fb774047a25373c276dc4b75df8299e67f186b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 19:50:22 +0000 Subject: [PATCH 110/896] Update dependencies from https://github.com/aspnet/websdk build 20191029.4 (#3352) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19529.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8ae13b08aa6..1dcd87cfe20a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 7b3bc68b31bee229cd5d73bf653df69b719303bb + f253fcb46bde9d900cc77a65636b4f0d70657ee4 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index e2da86b81f5a..b844d121a977 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.100-rc2.19516.3 + 3.0.100-rc2.19529.4 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From f28d839cbf3bd91cb86e466703e3c6d81b9624a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 20:16:00 +0000 Subject: [PATCH 111/896] Update dependencies from https://github.com/dotnet/cli build 20191029.2 (#3353) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19529.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dcd87cfe20a..ffbad65c1847 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - c3cce065adb627a490f54af09bccb290f9dce852 + aa188b4b7d61ce49e971377dff037c31918fca9f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b844d121a977..540bd00c0949 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19525.3 + 3.0.101-servicing.19529.2 From abc73b807191ff9c7d1b503aec70f6eb0e64f1fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 20:36:53 +0000 Subject: [PATCH 112/896] Update dependencies from https://github.com/dotnet/sdk build 20191029.1 (#12992) - Microsoft.NET.Sdk - 3.0.101-servicing.19529.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 655bfd742883..b71016ff0e41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 2163fbce7a27c22ca133f7bce59781aac7ba6044 + 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index b9037e357966..b1012547b489 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.0.101-servicing.19528.5 + 3.0.101-servicing.19529.1 $(MicrosoftNETSdkPackageVersion) From 2662a12facb706ecc1155643b2e0e37c5479d71f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 22:11:05 +0000 Subject: [PATCH 113/896] Update dependencies from https://github.com/dotnet/cli build 20191029.3 (#3359) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19529.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffbad65c1847..e4769986a5e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - aa188b4b7d61ce49e971377dff037c31918fca9f + abc73b807191ff9c7d1b503aec70f6eb0e64f1fa https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 540bd00c0949..2a07488f6551 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19529.2 + 3.0.101-servicing.19529.3 From 3ebe0fd6ac4cb911dedb4d986a462ee163840288 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 01:55:29 +0000 Subject: [PATCH 114/896] Update dependencies from https://github.com/dotnet/sdk build 20191029.4 (#12995) - Microsoft.NET.Sdk - 3.1.100-preview2.19529.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce9a57e63109..4d3c71c11ebb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 334812443d8bb11afa51a7efd2f8de83e321e6e1 + c0f6cf7488d21f13d9e96b0e87e77851be0e350d https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f60baa03caab..cc93208f097e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19528.2 + 3.1.100-preview2.19529.4 $(MicrosoftNETSdkPackageVersion) From a1e97a10ada1bfe947632426d2f68bcad152c096 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 06:00:26 +0000 Subject: [PATCH 115/896] Update dependencies from https://github.com/dotnet/sdk build 20191029.5 (#12997) - Microsoft.NET.Sdk - 3.1.100-preview2.19529.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d3c71c11ebb..b6c956a20e6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - c0f6cf7488d21f13d9e96b0e87e77851be0e350d + 2aa52a135c1a1fc0d6cebbc333af20571f5057e9 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index cc93208f097e..7224d1d87ab9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19529.4 + 3.1.100-preview2.19529.5 $(MicrosoftNETSdkPackageVersion) From 35a2db8a4ebccd6598ba873511c3c989456a4fa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 12:10:39 +0000 Subject: [PATCH 116/896] Update dependencies from https://github.com/dotnet/sdk build 20191030.1 (#12998) - Microsoft.NET.Sdk - 3.1.100-preview2.19530.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6c956a20e6a..df94656b4228 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 2aa52a135c1a1fc0d6cebbc333af20571f5057e9 + 6a09111e0fc54a895f6975af796c8133fdd47fd6 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 7224d1d87ab9..d4332e787d00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19529.5 + 3.1.100-preview2.19530.1 $(MicrosoftNETSdkPackageVersion) From 33cc830ee4867b2cc6be513fe1c0669a8eb40ec3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:00:33 +0000 Subject: [PATCH 117/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.3 (#12999) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df94656b4228..8bd2e4bc819b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 471e4710a818849eaf22c5977281d10fd6758616 + 8e3075d3915a55f90b2c9e35d975e476964cd014 diff --git a/eng/Versions.props b/eng/Versions.props index d4332e787d00..995ab0a5a8d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview2.19528.8 + 3.1.0-preview3.19530.3 From 9974bacf211d2b39b0d599a7e52835c24a0916b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 21:00:36 +0000 Subject: [PATCH 118/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#12996) * Update dependencies from https://github.com/dotnet/core-setup build 20191029.2 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19529.2 - Microsoft.NET.HostModel - 3.1.0-preview2.19529.2 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19529.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19529.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19529.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19529.2 * Update dependencies from https://github.com/dotnet/core-setup build 20191029.3 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19529.3 - Microsoft.NET.HostModel - 3.1.0-preview2.19529.3 - Microsoft.Extensions.DependencyModel - 3.1.0-preview2.19529.3 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview2.19529.3 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19529.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19529.3 * Update dependencies from https://github.com/dotnet/core-setup build 20191030.4 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19530.4 - Microsoft.NET.HostModel - 3.1.0-preview3.19530.4 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19530.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19530.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19530.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bd2e4bc819b..1f87a899cde4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 - + https://github.com/dotnet/core-setup - 5672978d912db81b4b677fddff264907a47ec9a8 + ce871036d2f45c3268a9463cc5405958c4f5b3f7 diff --git a/eng/Versions.props b/eng/Versions.props index 995ab0a5a8d7..905be0db27eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 - 3.1.0-preview2.19525.6 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 + 3.1.0-preview3.19530.4 From ff1c6c41144be2906eeef13b23d095f6529a7a62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 23:25:47 +0000 Subject: [PATCH 119/896] [release/3.1.1xx] Update dependencies from dotnet/sdk (#13002) * Update dependencies from https://github.com/dotnet/sdk build 20191030.5 - Microsoft.NET.Sdk - 3.1.100-preview2.19530.5 * Update dependencies from https://github.com/dotnet/sdk build 20191030.6 - Microsoft.NET.Sdk - 3.1.100-preview2.19530.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f87a899cde4..463c7c2cb97e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 6a09111e0fc54a895f6975af796c8133fdd47fd6 + 958de2e07848f1a1ea808ba7999432b1e257d77e https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 905be0db27eb..06dc01de954a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19530.1 + 3.1.100-preview2.19530.6 $(MicrosoftNETSdkPackageVersion) From 6971b59c98a4333f55c664a7718370b6d1e0c180 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 01:02:26 +0000 Subject: [PATCH 120/896] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#13000) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 463c7c2cb97e..993cd7204fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 8e3075d3915a55f90b2c9e35d975e476964cd014 + 55c8dd25c3f337f9e7098ad787534bd04454b113 diff --git a/eng/Versions.props b/eng/Versions.props index 06dc01de954a..47f331533855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19530.3 + 3.1.0-preview3.19530.8 From 0a6e328d60f3699e205b1fa7e00e2de38436a37b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 01:35:27 +0000 Subject: [PATCH 121/896] Update dependencies from https://github.com/dotnet/sdk build 20191030.7 (#13004) - Microsoft.NET.Sdk - 3.1.100-preview2.19530.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 993cd7204fa3..f0fcdfb26e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 958de2e07848f1a1ea808ba7999432b1e257d77e + fb710543566de826da30550e45bdbc60deb2cee0 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 47f331533855..4aba233f9c77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19530.6 + 3.1.100-preview2.19530.7 $(MicrosoftNETSdkPackageVersion) From fdad61606cd2fcaedb1acf4fa149430ea4bb1d90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 04:10:26 +0000 Subject: [PATCH 122/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.9 (#13005) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0fcdfb26e06..50f1e8200052 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 55c8dd25c3f337f9e7098ad787534bd04454b113 + 11a84e25b49677b52b06768a7cba3619eb7e8cf1 diff --git a/eng/Versions.props b/eng/Versions.props index 4aba233f9c77..2bfd8a3993e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19530.8 + 3.1.0-preview3.19530.9 From 9b71cd890cfa29423ba9737f971d3282a5c2d598 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 07:25:28 +0000 Subject: [PATCH 123/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191030.11 (#13006) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19530.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50f1e8200052..57db128535df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 11a84e25b49677b52b06768a7cba3619eb7e8cf1 + 63c802bae20b3cd5e704d6dd3ed90bc8225bc60e diff --git a/eng/Versions.props b/eng/Versions.props index 2bfd8a3993e3..58b99745a1dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19530.9 + 3.1.0-preview3.19530.11 From 2bf0eb7336edcd27cc446c9a081cf3f28fc96259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer=20=28Moravia=20IT=29?= Date: Thu, 31 Oct 2019 11:03:06 +0100 Subject: [PATCH 124/896] LOC CHECKIN | dotnet/cli release/3.1.1xx | 20191031 --- .../xlf/LocalizableStrings.cs.xlf | 4 ++-- .../xlf/LocalizableStrings.de.xlf | 4 ++-- .../xlf/LocalizableStrings.es.xlf | 4 ++-- .../xlf/LocalizableStrings.fr.xlf | 4 ++-- .../xlf/LocalizableStrings.it.xlf | 4 ++-- .../xlf/LocalizableStrings.ja.xlf | 4 ++-- .../xlf/LocalizableStrings.ko.xlf | 6 +++--- .../xlf/LocalizableStrings.pl.xlf | 4 ++-- .../xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../xlf/LocalizableStrings.ru.xlf | 4 ++-- .../xlf/LocalizableStrings.tr.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- .../dotnet-clean/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-clean/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-clean/xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 18 +++++++++--------- .../xlf/LocalizableStrings.zh-Hant.xlf | 10 +++++----- .../dotnet-test/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../install/xlf/LocalizableStrings.cs.xlf | 2 +- .../install/xlf/LocalizableStrings.it.xlf | 2 +- .../install/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../install/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- src/dotnet/xlf/CommonLocalizableStrings.de.xlf | 2 +- src/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ja.xlf | 2 +- src/dotnet/xlf/CommonLocalizableStrings.pl.xlf | 2 +- .../xlf/CommonLocalizableStrings.pt-BR.xlf | 2 +- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 4 ++-- 47 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf index ae01902b23bb..bba5ee69a079 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf @@ -30,9 +30,9 @@ Psaní první aplikace: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Vítá vás .NET Core {0}! --------------------- -SDK Version: {1} +Verze sady SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf index 9204f08d1b15..8cb60c6fc109 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf @@ -30,9 +30,9 @@ Schreiben Sie Ihre erste Anwendung: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Willkommen bei .NET Core {0}! --------------------- -SDK Version: {1} +SDK-Version: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 13126020a04b..8a281a7755f4 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -30,9 +30,9 @@ Escriba su primera aplicación: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Esto es .NET Core {0}. --------------------- -SDK Version: {1} +Versión del SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf index 4be57e6d9888..b6d989ae7630 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf @@ -30,9 +30,9 @@ Utilisez 'dotnet --help' pour voir les commandes disponibles, ou accédez à htt Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Bienvenue dans .NET Core {0} ! --------------------- -SDK Version: {1} +Version du kit SDK : {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf index 972b9c2300f7..37ac1f233ffe 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf @@ -30,9 +30,9 @@ Istruzioni per la creazione della prima app: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Benvenuti a .NET Core {0} --------------------- -SDK Version: {1} +Versione SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf index 8186b6e1514f..3563ace95512 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf @@ -30,9 +30,9 @@ Write your first app: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + .NET Core {0} へようこそ! --------------------- -SDK Version: {1} +SDK バージョン: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf index 0a9fadacc1eb..4ab75a3025ac 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf @@ -30,9 +30,9 @@ GitHub에서 문제 보고 및 소스 찾기: https://github.com/dotnet/core Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + .NET Core {0}을(를) 시작합니다. --------------------- -SDK Version: {1} +SDK 버전: {1} @@ -43,7 +43,7 @@ The .NET Core tools collect usage data in order to help us improve your experien Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry 원격 분석 --------- -.NET Core 도구는 사용자 환경 개선을 위해 사용량 데이터를 수집합니다. 데이터는 익명입니다. Microsoft에서 데이터를 수집하여 커뮤니티와 공유합니다. 원하는 셸에서 DOTNET_CLI_TELEMETRY_OPTOUT 환경 변수를 '1' 또는 'true'로 설정하여 원격 분석을 옵트아웃할 수 있습니다. +.NET Core 도구는 사용자 환경 개선을 위해 사용량 현황 데이터를 수집합니다. 데이터는 익명입니다. Microsoft에서 데이터를 수집하여 커뮤니티와 공유합니다. 원하는 셸에서 DOTNET_CLI_TELEMETRY_OPTOUT 환경 변수를 '1' 또는 'true'로 설정하여 원격 분석을 옵트아웃할 수 있습니다. .NET Core CLI 도구 원격 분석에 대한 자세한 내용은 https://aka.ms/dotnet-cli-telemetry를 참조하세요. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf index d01911844199..85e2869b19b7 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf @@ -30,9 +30,9 @@ Napisz swoją pierwszą aplikację: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + .NET Core {0} — Zapraszamy! --------------------- -SDK Version: {1} +Wersja zestawu SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf index b6b2ad740649..53333972bddb 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf @@ -30,9 +30,9 @@ Crie seu primeiro aplicativo: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Bem-vindo ao .NET Core {0}. --------------------- -SDK Version: {1} +Versão do SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf index afebda4b3556..27a27cbff4e7 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf @@ -30,9 +30,9 @@ Write your first app: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + Вас приветствует .NET Core {0}! --------------------- -SDK Version: {1} +Версия пакета SDK: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf index 6311d34f10b9..204b5b125b48 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf @@ -30,9 +30,9 @@ Kullanılabilen komutları görmek için 'dotnet --help' komutunu kullanın veya Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + .NET Core {0} sürümüne hoş geldiniz! --------------------- -SDK Version: {1} +SDK Sürümü: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf index 4f39dfed5105..a70573e5312c 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf @@ -30,9 +30,9 @@ Write your first app: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + 欢迎使用 .NET Core {0}! --------------------- -SDK Version: {1} +SDK 版本: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf index 88a2e9de249f..9711961627ab 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf @@ -30,9 +30,9 @@ Write your first app: https://aka.ms/first-net-core-app Welcome to .NET Core {0}! --------------------- SDK Version: {1} - Welcome to .NET Core {0}! + 歡迎使用 .NET Core {0}! --------------------- -SDK Version: {1} +SDK 版本: {1} diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf index 36ee22e40e8b..dab78628f393 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.cs.xlf @@ -24,7 +24,7 @@ The directory containing the build artifacts to clean. - Adresář obsahující artefakty sestavení, které se mají vyčistit + Adresář obsahující artefakty buildu, které se mají vyčistit diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf index f20eb2208e14..f71f4e9ed2b0 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.es.xlf @@ -24,7 +24,7 @@ The directory containing the build artifacts to clean. - El directorio que contiene los artefactos compilados para limpiar. + Directorio que contiene los artefactos de compilación para limpiar. diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf index dfcf94b0ffc4..591d65344312 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.it.xlf @@ -24,7 +24,7 @@ The directory containing the build artifacts to clean. - Directory contenente gli artefatti di compilazione da pulire. + Directory contenente gli artefatti della compilazione da pulire. diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf index bf5d62bb2d85..af6c1d8d97ce 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf @@ -24,7 +24,7 @@ The directory containing the build artifacts to clean. - O diretório que contém os artefatos de build a serem limpos. + O diretório que contém os artefatos de compilação a serem limpos. diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf index 51bcc78d65c7..76bbf5f0ed63 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.zh-Hans.xlf @@ -24,7 +24,7 @@ The directory containing the build artifacts to clean. - 包含要清理的生成项目的目录。 + 包含要清理的生成工件的目录。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index ce528be8d97b..161035c495e8 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -79,7 +79,7 @@ Publish a .NET project for deployment. - .NET プロジェクトを配置のために発行します。 + .NET プロジェクトを配置のために公開します。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index 5f10b41ca58c..f3d44dc1afd8 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -79,7 +79,7 @@ Publish a .NET project for deployment. - Publikuj projekt platformy .NET do wdrożenia. + Opublikuj projekt platformy .NET do wdrożenia. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index d82e74a6c515..2d39b8b21b0c 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -79,7 +79,7 @@ Publish a .NET project for deployment. - 為部署發行 .NET 專案。 + 為部署發佈 .NET 專案。 diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index 56eaf95a28e9..23b6931074b8 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -19,12 +19,12 @@ The target framework to publish for. The target framework has to be specified in the project file. - 発行する対象のターゲット フレームワーク。ターゲット フレームワークはプロジェクト ファイルで指定する必要があります。 + 公開する対象のターゲット フレームワーク。ターゲット フレームワークはプロジェクト ファイルで指定する必要があります。 Publish your application as a framework dependent application without the .NET Core runtime. A supported .NET Core runtime must be installed to run your application. - .NET Core ランタイムを使用せずに、アプリケーションをフレームワーク依存アプリケーションとして発行します。アプリケーションを実行するには、サポートされている .NET Core ランタイムをインストールする必要があります。 + .NET Core ランタイムを使用せずに、アプリケーションをフレームワーク依存アプリケーションとして公開します。アプリケーションを実行するには、サポートされている .NET Core ランタイムをインストールする必要があります。 @@ -34,7 +34,7 @@ The output directory to place the published artifacts in. - 発行された成果物を配置する出力ディレクトリ。 + 公開された成果物を配置する出力ディレクトリ。 @@ -44,24 +44,24 @@ The path to a target manifest file that contains the list of packages to be excluded from the publish step. - 発行ステップから除外されるパッケージのリストを含むターゲット マニフェスト ファイルへのパス。 + 公開ステップから除外されるパッケージのリストを含むターゲット マニフェスト ファイルへのパス。 Do not build the project before publishing. Implies --no-restore. - 発行する前にプロジェクトをビルドしないでください。--no-restore を意味します。 + 公開する前にプロジェクトをビルドしないでください。--no-restore を意味します。 The target runtime to publish for. This is used when creating a self-contained deployment. The default is to publish a framework-dependent application. - 発行するターゲット ランタイムです。自己完結型の配置を作成するときに使用されます。 -既定では、フレームワークに依存したアプリケーションが発行されます。 + 公開するターゲット ランタイムです。自己完結型の配置を作成するときに使用されます。 +既定では、フレームワークに依存したアプリケーションが公開されます。 The configuration to publish for. The default for most projects is 'Debug'. - 発行する対象の構成。大部分のプロジェクトで、既定値は 'Debug' です。 + 公開する対象の構成。大部分のプロジェクトで、既定値は 'Debug' です。 @@ -72,7 +72,7 @@ The default is to publish a framework-dependent application. Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. The default is 'true' if a runtime identifier is specified. - ランタイムをターゲット マシンにインストールする必要がないように、アプリケーションに .NET Core ランタイムを発行します。 + ランタイムをターゲット マシンにインストールする必要がないように、アプリケーションに .NET Core ランタイムを公開します。 ランタイム識別子が指定されている場合、既定値は 'true' です。 diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf index f4ce792a94b8..f31b07d854b5 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -19,7 +19,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - 要為其進行發行的目標架構。該架構必須在專案檔中指定。 + 要為其進行發佈的目標架構。該架構必須在專案檔中指定。 @@ -34,7 +34,7 @@ The output directory to place the published artifacts in. - 放置發行之成品的輸出目錄。 + 放置發佈之成品的輸出目錄。 @@ -44,12 +44,12 @@ The path to a target manifest file that contains the list of packages to be excluded from the publish step. - 目標資訊清單檔案的路徑，其包含要從發行步驟中排除的套件清單。 + 目標資訊清單檔案的路徑，其包含要從發佈步驟中排除的套件清單。 Do not build the project before publishing. Implies --no-restore. - 請勿在執行之前建置專案。提示：-no-restore。 + 請勿在發佈之前建置專案。提示：-no-restore。 @@ -61,7 +61,7 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. - 要為其進行發行的組態。大部分的專案預設為「偵錯」。 + 要為其進行發佈的組態。大部分的專案預設為「偵錯」。 diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf index 4f436a36bb2f..820afbdbe35c 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf @@ -121,7 +121,7 @@ Pokud zadaný adresář neexistuje, bude vytvořen. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Následující argumenty se ignorovaly: {0} diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf index fcd3ee044f54..93f42fbe2ea4 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf @@ -121,7 +121,7 @@ Das angegebene Verzeichnis wird erstellt, wenn es nicht vorhanden ist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Die folgenden Argumente wurden ignoriert: {0} diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf index c8bc8103e183..13ae592055e5 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf @@ -121,7 +121,7 @@ Si no existe, se creará el directorio especificado. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Se han omitido los argumentos siguientes: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf index 1f233cc02f67..0fcb83039c22 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf @@ -121,7 +121,7 @@ Le répertoire spécifié est créé, s'il n'existe pas déjà. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Les arguments suivants ont été ignorés : "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf index de598c4d3735..9276718f1bc5 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf @@ -121,7 +121,7 @@ Se non esiste, la directory specificata verrà creata. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Gli argomenti seguenti sono stati ignorati: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf index 5988cab107ce..dc6a9ac5e09d 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf @@ -121,7 +121,7 @@ The specified directory will be created if it does not exist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + 次の引数は無視されました: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf index 0ee93e7ee27a..5125d3797428 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf @@ -121,7 +121,7 @@ The specified directory will be created if it does not exist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + "{0}" 인수가 무시되었습니다. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf index 779844cd48a8..7ff558fd0168 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf @@ -121,7 +121,7 @@ Jeśli określony katalog nie istnieje, zostanie utworzony. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Następujące argumenty zostały zignorowane: „{0}” diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf index 9762a7b6acc0..d2a1e3f569c0 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf @@ -121,7 +121,7 @@ O diretório especificado será criado se ele ainda não existir. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Os argumentos a seguir foram ignorados: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf index 12d17ce56f26..d6d504e52496 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf @@ -121,7 +121,7 @@ The specified directory will be created if it does not exist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Следующие аргументы пропущены: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf index 0dea2fd85406..04e42a7adf52 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf @@ -121,7 +121,7 @@ Belirtilen dizin yoksa oluşturulur. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + Şu bağımsız değişkenler yoksayıldı: "{0}" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf index 40a6357cbec1..9de65a19d0b6 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf @@ -121,7 +121,7 @@ The specified directory will be created if it does not exist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + 已忽略以下参数:“{0}” diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf index b0e16edaaad4..6c731e684a8e 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf @@ -121,7 +121,7 @@ The specified directory will be created if it does not exist. The following arguments have been ignored : "{0}" - The following arguments have been ignored : "{0}" + 已忽略下列引數: "{0}" diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index 0eeb2571861c..030cf212ec22 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -149,7 +149,7 @@ For more reasons, including package naming enforcement, visit https://aka.ms/fai * Požadovaný informační kanál NuGet je nedostupný, pravděpodobně z důvodu potíží s připojením k internetu. * Zadali jste chybně název nástroje. -Další příčiny, včetně vynucování názvů balíčků, najdete tady: https://aka.ms/failure-installing-tool +Další příčiny, včetně vynucování formátu názvů balíčků, najdete tady: https://aka.ms/failure-installing-tool diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index bdc99cae2de8..942f77a3da1a 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -149,7 +149,7 @@ For more reasons, including package naming enforcement, visit https://aka.ms/fai * Non è possibile accedere al feed NuGet richiesto, probabilmente a causa di un problema di connessione Internet. * Il nome dello strumento non è stato digitato correttamente. -Per altri motivi, inclusa l'assegnazione imposta del nome ai pacchetti, visitare https://aka.ms/failure-installing-tool +Per altri motivi, inclusa l'aggiunta obbligatoria del prefisso microsoft ai nomi di pacchetto, visitare https://aka.ms/failure-installing-tool diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index df43c2d80969..35cd0b8a0a58 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -144,10 +144,10 @@ If you would like to create a manifest, use `dotnet new tool-manifest`, usually For more reasons, including package naming enforcement, visit https://aka.ms/failure-installing-tool Не удалось установить средство "{0}". Возможные причины сбоя: -* Вы пытаетесь установить предварительный выпуск и не указали версию с помощью параметра --version. -* Пакет с таким именем найден, но он не является средством .NET Core. -* Недоступен требуемый веб-канал NuGet, возможно, из-за проблемы с подключением к Интернету. -* Неправильно введено имя средства. +– Вы пытаетесь установить предварительный выпуск и не указали версию с помощью параметра --version. +– Пакет с таким именем найден, но он не является инструментом .NET Core. +– Требуемый веб-канал NuGet недоступен, возможно, из-за проблемы с подключением к Интернету. +– Неверно введено имя средства. Сведения о других возможных причинах сбоя, в том числе о принудительном именовании пакетов, см. на странице https://aka.ms/failure-installing-tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index 90a7ba50b3b3..2f005f6a4653 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -145,7 +145,7 @@ For more reasons, including package naming enforcement, visit https://aka.ms/fai 工具“{0}”安装失败。此故障可能由以下原因导致: * 你尝试安装预览版，但未使用 --version 选项来指定该版本。 -* 已按此名称找到包，但是它没有 .NET Core 工具。 +* 已找到具有此名称的包，但是它不是 .NET Core 工具。 * 无法访问所需的 NuGet 源，这可能是由于 Internet 连接问题导致。 * 工具名称输入错误。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index 290c64400ab1..1dfab11df58a 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -856,7 +856,7 @@ setx PATH "%PATH%;{0}" Failed to find staged tool package '{0}'. - Das bereitgestellte Toolpaket "{0}" wurde nicht gefunden. + Das gestagete Toolpaket "{0}" wurde nicht gefunden. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 5002f3271eec..9cc36e20e3dd 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -679,7 +679,7 @@ export PATH="$PATH:{0}" Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. - Définissez le niveau de détail MSBuild. Les valeurs autorisées sont q[uiet], m[inimal], n[ormal], d[etailed] et diag[nostic]. + Définissez le niveau de verbosité MSBuild. Les valeurs autorisées sont q[uiet], m[inimal], n[ormal], d[etailed] et diag[nostic]. @@ -856,7 +856,7 @@ setx PATH "%PATH%;{0}" Failed to find staged tool package '{0}'. - Package d'outils intermédiaire '{0}' introuvable. + Package d'outils indexé '{0}' introuvable. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 2581877c615e..ffbdf9745bff 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -856,7 +856,7 @@ setx PATH "%PATH%;{0}" Failed to find staged tool package '{0}'. - ステージング済みのツール パッケージ '{0}' が見つかりませんでした。 + ステージ済みのツール パッケージ '{0}' が見つかりませんでした。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 51d9c245c278..318965d8528f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -856,7 +856,7 @@ setx PATH "%PATH%;{0}" Failed to find staged tool package '{0}'. - Nie można odnaleźć etapowego pakietu narzędzia „{0}”. + Nie można odnaleźć przygotowanego pakietu narzędzia „{0}”. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index 36a88fa1009a..a4829b1e63cd 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -679,7 +679,7 @@ export PATH="$PATH:{0}" Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. - Definir o nível de detalhes do MSBuild. Os valores permitidos são q[uiet], m[inimal], n[ormal], d[etailed] e diag[nostic]. + Definir o nível de detalhamento do MSBuild. Os valores permitidos são q[uiet], m[inimal], n[ormal], d[etailed] e diag[nostic]. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index dedaa4efdae3..f628b6bbd9bb 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -679,7 +679,7 @@ EOF Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. - 设置 MSBuild 详细级别。允许值为 q[uiet]、m[inimal]、n[ormal]、d[etailed] 和 diag[nostic]。 + 设置 MSBuild 详细程度。允许值为 q[uiet]、m[inimal]、n[ormal]、d[etailed] 和 diag[nostic]。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 87b07d2362e0..125eba63d3d1 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -679,7 +679,7 @@ export PATH="$PATH:{0}" Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. - 設定 MSBuild 的詳細資訊層級。允許的值為 q[uiet]、m[inimal]、n[ormal]、d[etailed] 及 diag[nostic]。 + 設定 MSBuild 的詳細程度層級。允許的值為 q[uiet]、m[inimal]、n[ormal]、d[etailed] 及 diag[nostic]。 @@ -856,7 +856,7 @@ setx PATH "%PATH%;{0}" Failed to find staged tool package '{0}'. - 無法找到分段工具套件 '{0}'。 + 無法找到暫存工具套件 '{0}'。 From 7d7e6c3ee06cc44607b6ce83c0cfb0c37db4971d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 14:20:33 +0000 Subject: [PATCH 125/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.1 (#13008) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57db128535df..d2c3c68f614e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 - + https://github.com/aspnet/AspNetCore - 63c802bae20b3cd5e704d6dd3ed90bc8225bc60e + 0faf33914345956525640464c854cf85da5a6573 diff --git a/eng/Versions.props b/eng/Versions.props index 58b99745a1dd..046e9eeb6af5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19530.11 + 3.1.0-preview3.19531.1 From 656490c52bd21882acd9167c734040dbf0698382 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 18:49:51 +0000 Subject: [PATCH 126/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13001) * Update dependencies from https://github.com/dotnet/core-setup build 20191030.5 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19530.5 - Microsoft.NET.HostModel - 3.1.0-preview3.19530.5 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19530.5 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19530.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19530.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19530.5 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191031.6 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.6 - Microsoft.NET.HostModel - 3.1.0-preview3.19531.6 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19531.6 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19531.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19531.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.6 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2c3c68f614e..e17ee8f6f620 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/core-setup - ce871036d2f45c3268a9463cc5405958c4f5b3f7 + d992cb6bb8368a7f3161fbf1a863b073ec28c956 - + https://github.com/dotnet/corefx - 427c7bd763aeea6c2391eec6fa7ae9ea1a2847c0 + d29d1bf34dea385124d076405ccb66ccfd173a86 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 046e9eeb6af5..cca2fe8c15de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 - 3.1.0-preview3.19530.4 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 + 3.1.0-preview3.19531.6 From c71f3f63ee3c44f348e4189b97633e58b79e34b4 Mon Sep 17 00:00:00 2001 From: Donnie Goodson Date: Thu, 31 Oct 2019 13:33:21 -0700 Subject: [PATCH 127/896] Skip Duplicate added to NuGet Push --- src/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs | 3 ++- test/dotnet.Tests/CommandTests/CompleteCommandTests.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs b/src/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs index bd9b0aecaced..38b809738e64 100644 --- a/src/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs +++ b/src/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs @@ -54,7 +54,8 @@ public static Command NuGet() => Create.Option("-d|--disable-buffering", Parser.CompletionOnlyDescription), Create.Option("-n|--no-symbols", Parser.CompletionOnlyDescription), Create.Option("--no-service-endpoint", Parser.CompletionOnlyDescription), - Create.Option("--interactive", Parser.CompletionOnlyDescription) + Create.Option("--interactive", Parser.CompletionOnlyDescription), + Create.Option("--skip-duplicate", Parser.CompletionOnlyDescription) )); } } diff --git a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs index b10f2e18b340..f9ab85cda674 100644 --- a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs @@ -177,6 +177,7 @@ public void GivenNuGetPushCommandItDisplaysCompletions() "--help", "--no-service-endpoint", "--no-symbols", + "--skip-duplicate", "--source", "--symbol-api-key", "--symbol-source", From c7aa67cebafb228617d1b6b2c96e52780bbc4c0f Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 31 Oct 2019 15:30:02 -0700 Subject: [PATCH 128/896] Update branding to preview3 (#13011) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cca2fe8c15de..23e4dd88ec3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3.1.100 - preview2 + preview3 From 0ae7613529d36300fce752f657737f10495bd702 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 02:48:26 +0000 Subject: [PATCH 129/896] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#13010) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191031.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19531.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e17ee8f6f620..fec3ed92995f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 0faf33914345956525640464c854cf85da5a6573 + e89f2f450263f865f20c2c7b77f4e30daedc7c47 diff --git a/eng/Versions.props b/eng/Versions.props index 23e4dd88ec3a..abb2f1f1c85e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19531.1 + 3.1.0-preview3.19531.7 From c3fb2eec9067143c7b175bbf5d30e60858b22547 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 05:35:18 +0000 Subject: [PATCH 130/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191031.10 (#3412) - Microsoft.NET.Sdk.Razor - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc5d7bcc6977..0edb1bf34b4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4769986a5e3..4b53159abb33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://github.com/aspnet/AspNetCore-Tooling - 4ef35e11af80a5907438d1a715e51803acf1077c + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf From c710920a5ffa5ebf9f19a80a5ab26180132399a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 07:29:50 +0000 Subject: [PATCH 131/896] [release/3.1.1xx] Update dependencies from dotnet/sdk (#13013) * Update dependencies from https://github.com/dotnet/sdk build 20191031.2 - Microsoft.NET.Sdk - 3.1.100-preview2.19531.2 * Update dependencies from https://github.com/dotnet/sdk build 20191031.5 - Microsoft.NET.Sdk - 3.1.100-preview2.19531.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fec3ed92995f..cd38dacd2cf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - fb710543566de826da30550e45bdbc60deb2cee0 + 61f8ebe1b773d85117bcb64f48abcc8377c830c2 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index abb2f1f1c85e..74ff4586cfca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19530.7 + 3.1.100-preview2.19531.5 $(MicrosoftNETSdkPackageVersion) From cb0c7cb0fd756b4fba19d42aad2f60e8654b09ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 18:25:32 +0000 Subject: [PATCH 132/896] Update dependencies from https://github.com/dotnet/sdk build 20191101.2 (#13016) - Microsoft.NET.Sdk - 3.1.100-preview3.19551.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd38dacd2cf1..facd38767013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 61f8ebe1b773d85117bcb64f48abcc8377c830c2 + 0f41b3f4909ea5a1955fccf5a2125ca1a76b69c7 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 74ff4586cfca..94327e00ec13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview2.19531.5 + 3.1.100-preview3.19551.2 $(MicrosoftNETSdkPackageVersion) From 8e5841760159acfe4dc527621da3ee178e99a3e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 00:15:34 +0000 Subject: [PATCH 133/896] Update dependencies from https://github.com/dotnet/sdk build 20191101.3 (#13017) - Microsoft.NET.Sdk - 3.1.100-preview3.19551.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index facd38767013..6669d3e4bae9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 0f41b3f4909ea5a1955fccf5a2125ca1a76b69c7 + 6048f06be9dc82e688644debd2bdd66b88473429 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 94327e00ec13..92c05373d497 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19551.2 + 3.1.100-preview3.19551.3 $(MicrosoftNETSdkPackageVersion) From 6dab769e2e7a25765543fb27a4f58d6bfb31238b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 01:35:17 +0000 Subject: [PATCH 134/896] Update dependencies from https://github.com/aspnet/websdk build 20191101.3 (#3429) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19551.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b53159abb33..801f6d474b0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - f253fcb46bde9d900cc77a65636b4f0d70657ee4 + ce26eba9953903dfdb7720eb31dccb9f232b02eb https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 2a07488f6551..82bb2202c394 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.100-rc2.19529.4 + 3.0.100-rc2.19551.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From c368e26644c749a7cbc340f2b53ee0e2fd65cbbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 03:15:29 +0000 Subject: [PATCH 135/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.11 (#13019) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19551.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6669d3e4bae9..3e5a0514c0fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - e89f2f450263f865f20c2c7b77f4e30daedc7c47 + 4d3eccccf012d154a3c591964b0cb455014e2b7d diff --git a/eng/Versions.props b/eng/Versions.props index 92c05373d497..2022c167c56b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19531.7 + 3.1.0-preview3.19551.11 From d7a85c972b60559ace43c1abaa16fea5cd972df4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 09:55:32 +0000 Subject: [PATCH 136/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.16 (#13020) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19551.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e5a0514c0fc..c36dafa17a9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 4d3eccccf012d154a3c591964b0cb455014e2b7d + 5709cd95b2db28ee2546be7797b913b129d97655 diff --git a/eng/Versions.props b/eng/Versions.props index 2022c167c56b..9a867a2dc241 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19551.11 + 3.1.0-preview3.19551.16 From 8f660e9648ccf09356bc453472644db18fe3e51f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 13:15:25 +0000 Subject: [PATCH 137/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191102.1 (#13021) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19552.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c36dafa17a9e..1705341e793b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx d29d1bf34dea385124d076405ccb66ccfd173a86 - + https://github.com/aspnet/AspNetCore - 5709cd95b2db28ee2546be7797b913b129d97655 + 507379d642c0fb9b17913cfa3e316c52c1163373 diff --git a/eng/Versions.props b/eng/Versions.props index 9a867a2dc241..b3ab6d6595bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19551.16 + 3.1.0-preview3.19552.1 From b4281dddd7f7153dda02bbc2a52d8ca970f68b0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 18:03:08 -0700 Subject: [PATCH 138/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13014) * Update dependencies from https://github.com/dotnet/core-setup build 20191031.15 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.15 - Microsoft.NET.HostModel - 3.1.0-preview3.19531.15 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19531.15 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19531.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19531.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.15 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191101.4 - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19551.4 - Microsoft.NET.HostModel - 3.1.0-preview3.19551.4 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19551.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19551.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19551.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19551.4 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19551.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1705341e793b..52516f1380d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/core-setup - d992cb6bb8368a7f3161fbf1a863b073ec28c956 + 00491cd463dc0a17996b8ddb24cf9faf390f04fb - + https://github.com/dotnet/corefx - d29d1bf34dea385124d076405ccb66ccfd173a86 + 281e5dab8db6d7e30d1529039143aa4c463b1a65 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b3ab6d6595bc..b42eec8fc369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 - 3.1.0-preview3.19531.6 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 + 3.1.0-preview3.19551.4 From 282a4237d00188636dd09307fac90e348ff3c970 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 18:04:53 -0700 Subject: [PATCH 139/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191102.5 (#13022) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19552.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52516f1380d4..83c82868692b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 281e5dab8db6d7e30d1529039143aa4c463b1a65 - + https://github.com/aspnet/AspNetCore - 507379d642c0fb9b17913cfa3e316c52c1163373 + fe164cd7666a2398a7959d31b4c528f3e71c018a diff --git a/eng/Versions.props b/eng/Versions.props index b42eec8fc369..19af68661de4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19552.1 + 3.1.0-preview3.19552.5 From 9e189dbee36c823f324795c71a037a6c7363fc26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 07:03:50 -0800 Subject: [PATCH 140/896] Update dependencies from https://github.com/dotnet/core-setup build 20191103.2 (#13023) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19553.2 - Microsoft.NET.HostModel - 3.1.0-preview3.19553.2 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19553.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19553.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19553.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19553.2 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19551.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83c82868692b..3d8dca376b4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/core-setup - 00491cd463dc0a17996b8ddb24cf9faf390f04fb + 13f35c3d86a40ff811bfde0b64cfb86431c19d15 - + https://github.com/dotnet/corefx - 281e5dab8db6d7e30d1529039143aa4c463b1a65 + 046765913dff824f9ed0f2d2fe0fb9b111906cf5 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 19af68661de4..c78c804841f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 - 3.1.0-preview3.19551.4 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 + 3.1.0-preview3.19553.2 From c143c98eeed7f532cfab1fb7e0104513b7c76743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2019 17:10:26 +0000 Subject: [PATCH 141/896] Update dependencies from https://github.com/dotnet/sdk build 20191103.1 (#13024) - Microsoft.NET.Sdk - 3.1.100-preview3.19553.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8dca376b4d..2b4ec0d402cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 6048f06be9dc82e688644debd2bdd66b88473429 + cecb7196560c8b8b732ef9c07494cac7e0745c76 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index c78c804841f3..463d885a988d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19551.3 + 3.1.100-preview3.19553.1 $(MicrosoftNETSdkPackageVersion) From cef679a0db78024555057298fbcf7ff356427ee0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 00:15:48 +0000 Subject: [PATCH 142/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191103.2 (#13025) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19553.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b4ec0d402cc..eb437f01763c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - fe164cd7666a2398a7959d31b4c528f3e71c018a + da20a1208694e8ed361a44d1225bd92d1ca1729a diff --git a/eng/Versions.props b/eng/Versions.props index 463d885a988d..ed89251177e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19552.5 + 3.1.0-preview3.19553.2 From 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 22:35:18 +0000 Subject: [PATCH 143/896] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#13018) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191101.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19551.9 * Revert to Rtm versions --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b71016ff0e41..725436bbad7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/AspNetCore - 2c6456d4634df947e3cafd5e7dee02289dc12697 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a diff --git a/eng/Versions.props b/eng/Versions.props index b1012547b489..a4ff39bc7a08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.0.1-servicing.19528.7 + 3.0.0-rc2.19465.2 From 88badb441d9477067b76916f046b8d0a212a6eca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 22:40:29 +0000 Subject: [PATCH 144/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.4 (#13026) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19554.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb437f01763c..de648bc49abb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - da20a1208694e8ed361a44d1225bd92d1ca1729a + e3b971a75e2512d267605aa190122b874d9d948d diff --git a/eng/Versions.props b/eng/Versions.props index ed89251177e9..453b210a030e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19553.2 + 3.1.0-preview3.19554.4 From ab399651d80164edc6884f2bc59b1dced515938c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 4 Nov 2019 14:22:04 -0800 Subject: [PATCH 145/896] Enable SDL validation --- .vsts-ci.yml | 58 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f2512e9cd4d3..c2fe31248318 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -3,21 +3,37 @@ trigger: - release/* variables: - teamName: Roslyn-Project-System - _DotNetArtifactsCategory: .NETCore - ${{ if eq(variables['System.TeamProject'], 'public') }}: - PB_PublishBlobFeedKey: - PB_PublishBlobFeedUrl: - _DotNetPublishToBlobFeed: false - _PublishUsingPipelines: false - _PublishType: none - _SignType: test - ${{ if ne(variables['System.TeamProject'], 'public') }}: - PB_PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - _DotNetPublishToBlobFeed: true - _PublishUsingPipelines: true - _PublishType: blob - _SignType: real + - name: _TeamName + value: Roslyn-Project-System + - name: _DotNetArtifactsCategory + value: .NETCore + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: PB_PublishBlobFeedKey + value: + - name: PB_PublishBlobFeedUrl + value: + - name: _DotNetPublishToBlobFeed + value: false + - name: _PublishUsingPipelines + value: false + - name: _PublishType + value: none + - name: _SignType + value: test + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - name: PB_PublishBlobFeedUrl + value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + - name: _DotNetPublishToBlobFeed + value: true + - name: _PublishUsingPipelines + value: true + - name: _PublishType + value: blob + - name: _SignType + value: real + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-CLI-SDLValidation-Params + stages: - stage: build @@ -176,3 +192,15 @@ stages: - template: /eng/common/templates/post-build/post-build.yml parameters: enableSymbolValidation: false + SDLValidationParameters: + enable: true + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-cli" + -TsaCodebaseName "dotnet-cli" + -TsaPublish $True' From cdeb9fe42575a336e130da975b2848b03f1c96cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 23:45:23 +0000 Subject: [PATCH 146/896] Update dependencies from https://github.com/dotnet/cli build 20191104.2 (#3460) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19554.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 801f6d474b0a..6e05be167534 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - abc73b807191ff9c7d1b503aec70f6eb0e64f1fa + 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 82bb2202c394..ca7f82156694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19529.3 + 3.0.101-servicing.19554.2 From 4742a2d9c56b249808bab066a12a50554377a90b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 06:20:20 +0000 Subject: [PATCH 147/896] Update dependencies from https://github.com/aspnet/websdk build 20191104.4 (#3464) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19554.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e05be167534..5fd9b8bccaed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - ce26eba9953903dfdb7720eb31dccb9f232b02eb + 389b280e262b5f74e8d08cd5c784d4ba18e2fe4d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index ca7f82156694..bf218009737c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.100-rc2.19551.3 + 3.0.100-rc2.19554.4 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From c774787db6ccb86203eedc5b22b66d130cdd6425 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 22:50:27 +0000 Subject: [PATCH 148/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191105.2 (#13032) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19555.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de648bc49abb..d15cd82c96cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - e3b971a75e2512d267605aa190122b874d9d948d + 80fec4e3edea3972e95885f5c0db6ee06072f917 diff --git a/eng/Versions.props b/eng/Versions.props index 453b210a030e..ed6d687a513f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19554.4 + 3.1.0-preview3.19555.2 From 590f10ed02c0dc45d5cbed6105d25b0b80b6e4f7 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 11 Nov 2019 10:25:45 -0800 Subject: [PATCH 149/896] Set DOTNET_ROOT in tests (#13039) --- .../Commands/TestCommand.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs index fcb35b3ff599..96832122a44e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs @@ -235,7 +235,19 @@ private void AddEnvironmentVariablesTo(ProcessStartInfo psi) } // Flow the TEST_PACKAGES environment variable to the child process - psi.Environment["TEST_PACKAGES"] = new RepoDirectoriesProvider().TestPackages; + RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider(); + psi.Environment["TEST_PACKAGES"] = repoDirectoriesProvider.TestPackages; + + // Set DOTNET_ROOT to ensure sub process find the same host fxr + string dotnetDirectoryPath = repoDirectoriesProvider.DotnetRoot; + if (System.Environment.Is64BitProcess) + { + psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath); + } + else + { + psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath); + } } private void AddDotnetToolPathToAvoidSettingPermanentEnvInBuildMachineOnWindows() From ce344a71e6f2704e742b5109700666c38493802a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 20:26:18 +0000 Subject: [PATCH 150/896] Update dependencies from https://github.com/dotnet/cli build 20191111.1 (#3514) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19561.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fd9b8bccaed..7ff4d25ed8a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea + 590f10ed02c0dc45d5cbed6105d25b0b80b6e4f7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index bf218009737c..eedd12332d40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19554.2 + 3.0.101-servicing.19561.1 From d5c007333c6ce428c2183738764fcdabe890e774 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 13:45:35 -0800 Subject: [PATCH 151/896] [release/3.1.1xx] Update dependencies from nuget/nuget.client (#13042) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.4.0.6292 - NuGet.Build.Tasks - 5.4.0-rtm.6292 * Set DOTNET_ROOT in tests * Fixup * Use right property * Fix use of RepoDirectoriesProvider * Try using RepoDirectoriesProvider().DotnetRoot directly --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../Commands/TestCommand.cs | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d15cd82c96cb..4d7436cd324c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,9 +55,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - c1f6915918b82c096bbd666bd9c18528f1f70630 + 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 diff --git a/eng/Versions.props b/eng/Versions.props index ed6d687a513f..97c96278b6ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.4.0-preview.3.6271 + 5.4.0-rtm.6292 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs index fcb35b3ff599..d6f1092ec9f7 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs @@ -146,6 +146,17 @@ private Process CreateProcess(string executable, string args) }; RemoveCliGeneratedEnvironmentVariablesFrom(psi); + + // Set DOTNET_ROOT to ensure sub process find the same host fxr + string dotnetDirectoryPath = new RepoDirectoriesProvider().DotnetRoot; + if (System.Environment.Is64BitProcess) + { + psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath); + } + else + { + psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath); + } AddEnvironmentVariablesTo(psi); From 9085b1d4b7b0ee847c803a50326d8444d3ab0fd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 14:10:39 -0800 Subject: [PATCH 152/896] Update dependencies from https://github.com/dotnet/sdk build 20191111.1 (#13043) - Microsoft.NET.Sdk - 3.1.100-preview3.19561.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d7436cd324c..32bb9fe78f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - cecb7196560c8b8b732ef9c07494cac7e0745c76 + d1373812342cdb91abce399e1926bb1f0421e17c https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 97c96278b6ca..e3294728e645 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19553.1 + 3.1.100-preview3.19561.1 $(MicrosoftNETSdkPackageVersion) From 6c79e55922acdedf4f3a0a817c87307c14b879f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:22:15 +0000 Subject: [PATCH 153/896] Update dependencies from https://github.com/dotnet/templating build 20191111.1 (#13044) - Microsoft.TemplateEngine.Cli - 3.1.0-preview1.19561.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32bb9fe78f90..551b6123ce63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - fa98e14b1b8d84a1a711ef909384f16ada8bbe7c + 0e0e29c869d62d794ad74d75274ddf0ea542ac2b https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e3294728e645..359f886a1269 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-preview1.19476.7 + 3.1.0-preview1.19561.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 253b9d86587c463442311b70e10bf4d610a8b235 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:06:28 -0800 Subject: [PATCH 154/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.3 (#13045) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19561.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 551b6123ce63..d122e90c832e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - 80fec4e3edea3972e95885f5c0db6ee06072f917 + ec5ccaca22a75559d90c88795b5cd6b1136c8a0a diff --git a/eng/Versions.props b/eng/Versions.props index 359f886a1269..d7430f4de1a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19555.2 + 3.1.0-preview3.19561.3 From e89ee5eed6774ede5beef71092414426ab159dec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:23:52 -0800 Subject: [PATCH 155/896] Update dependencies from https://github.com/dotnet/core-setup build 20191111.2 (#13046) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.2 - Microsoft.NET.HostModel - 3.1.0-preview3.19561.2 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19561.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19561.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d122e90c832e..53d78b8628ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 - + https://github.com/dotnet/core-setup - 13f35c3d86a40ff811bfde0b64cfb86431c19d15 + c48d220e20ba74585c951f8b6802af04c5cf52f9 diff --git a/eng/Versions.props b/eng/Versions.props index d7430f4de1a0..4b376d767783 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 - 3.1.0-preview3.19553.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.2 From d42d0617288667b55cf648fb1caacbad0b19be11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 18:17:20 -0800 Subject: [PATCH 156/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.6 (#13048) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19561.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53d78b8628ee..d2a3ea1f1fa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 046765913dff824f9ed0f2d2fe0fb9b111906cf5 - + https://github.com/aspnet/AspNetCore - ec5ccaca22a75559d90c88795b5cd6b1136c8a0a + a89b11096697d2742edb5719fee3b600a0ee8e63 diff --git a/eng/Versions.props b/eng/Versions.props index 4b376d767783..7150238a9851 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19561.3 + 3.1.0-preview3.19561.6 From 4b662dba11fab71bf54ba82040fd1e991d3d0abc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 18:24:29 -0800 Subject: [PATCH 157/896] Update dependencies from https://github.com/dotnet/core-setup build 20191111.4 (#13049) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.4 - Microsoft.NET.HostModel - 3.1.0-preview3.19561.4 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19561.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19561.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.4 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19561.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2a3ea1f1fa8..6c894da98d6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/core-setup - c48d220e20ba74585c951f8b6802af04c5cf52f9 + cc1f6a2b722e333e2022fc0cee3d71e5445a5698 - + https://github.com/dotnet/corefx - 046765913dff824f9ed0f2d2fe0fb9b111906cf5 + b59b5d67cf03324176b659ef1812969ac1e24c6f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7150238a9851..81a687deec2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 - 3.1.0-preview3.19561.2 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.4 From 1e934beee2533c3c386145f9cdedade822e68c60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 18:59:29 -0800 Subject: [PATCH 158/896] Update dependencies from https://github.com/dotnet/sdk build 20191111.2 (#13050) - Microsoft.NET.Sdk - 3.1.100-preview3.19561.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c894da98d6f..db3beadf4a13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - d1373812342cdb91abce399e1926bb1f0421e17c + 03f15d127b0c326bf35704dffaeb0f94b3ae9628 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 81a687deec2f..7e7ef0d5f59d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19561.1 + 3.1.100-preview3.19561.2 $(MicrosoftNETSdkPackageVersion) From 805ed54b5cd558c9a4431015850f4459facf52fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 04:35:30 +0000 Subject: [PATCH 159/896] Update dependencies from https://github.com/dotnet/core-setup build 20191111.5 (#13051) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.5 - Microsoft.NET.HostModel - 3.1.0-preview3.19561.5 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19561.5 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19561.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.5 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19561.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db3beadf4a13..c4a1fab346fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/core-setup - cc1f6a2b722e333e2022fc0cee3d71e5445a5698 + 829c0bf9b02e3296ddf8b1e623900b27c127dc13 - + https://github.com/dotnet/corefx - b59b5d67cf03324176b659ef1812969ac1e24c6f + 686da8f7f583c49fe820a8f694f0b968323d575b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7e7ef0d5f59d..a7f25e719780 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 - 3.1.0-preview3.19561.4 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.5 From b0614fac0c3cd74c86117f5cd02817c2c19d04e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 05:00:30 +0000 Subject: [PATCH 160/896] Update dependencies from https://github.com/dotnet/sdk build 20191111.3 (#13052) - Microsoft.NET.Sdk - 3.1.100-preview3.19561.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4a1fab346fa..13d3f1af40ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 03f15d127b0c326bf35704dffaeb0f94b3ae9628 + 9dfccc24dd0b76db7a50bbe14f02b8b173d49aca https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index a7f25e719780..afcb3992fdb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19561.2 + 3.1.100-preview3.19561.3 $(MicrosoftNETSdkPackageVersion) From 146877fd2ecca6d48412505d5774f80fdb4bdc71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:37:34 -0800 Subject: [PATCH 161/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.14 (#13054) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19561.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13d3f1af40ef..25a858445d4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 686da8f7f583c49fe820a8f694f0b968323d575b - + https://github.com/aspnet/AspNetCore - a89b11096697d2742edb5719fee3b600a0ee8e63 + 2548e40f65ae5941fec3c99294604eba92f7ff80 diff --git a/eng/Versions.props b/eng/Versions.props index afcb3992fdb4..ebe6d568185a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19561.6 + 3.1.0-preview3.19561.14 From d8dde1501569b86cdbf6cb1ba9e8fde6a5ad16df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 22:37:41 -0800 Subject: [PATCH 162/896] Update dependencies from https://github.com/dotnet/sdk build 20191111.4 (#13053) - Microsoft.NET.Sdk - 3.1.100-preview3.19561.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25a858445d4f..3c3e70b82eb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 9dfccc24dd0b76db7a50bbe14f02b8b173d49aca + 3b26982a3da07bb863e6cd9827e59c057c6cbbb0 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index ebe6d568185a..d8bba5a4051c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19561.3 + 3.1.100-preview3.19561.4 $(MicrosoftNETSdkPackageVersion) From 9384148ecbf9b10966917f7a947c1b0c72ef7055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 08:00:46 +0000 Subject: [PATCH 163/896] Update dependencies from https://github.com/dotnet/sdk build 20191111.5 (#13055) - Microsoft.NET.Sdk - 3.1.100-preview3.19561.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c3e70b82eb3..63a773844891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 3b26982a3da07bb863e6cd9827e59c057c6cbbb0 + f36a88342755978d934e02e6aa95b900d8b10961 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index d8bba5a4051c..03d0de8cb7b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19561.4 + 3.1.100-preview3.19561.5 $(MicrosoftNETSdkPackageVersion) From 67f856bd05ec8c476679143f0720ff5cb8d993b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 08:25:32 +0000 Subject: [PATCH 164/896] Update dependencies from https://github.com/dotnet/core-setup build 20191111.7 (#13056) - Microsoft.NETCore.App.Ref - 3.1.0-preview3.19561.7 - Microsoft.NET.HostModel - 3.1.0-preview3.19561.7 - Microsoft.Extensions.DependencyModel - 3.1.0-preview3.19561.7 - Microsoft.DotNet.PlatformAbstractions - 3.1.0-preview3.19561.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview3.19561.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19561.7 Dependency coherency updates - System.Text.Json - 4.7.0-preview3.19561.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63a773844891..04729ca99439 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/core-setup - 829c0bf9b02e3296ddf8b1e623900b27c127dc13 + cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 - + https://github.com/dotnet/corefx - 686da8f7f583c49fe820a8f694f0b968323d575b + e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 03d0de8cb7b7..288350e90359 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 - 3.1.0-preview3.19561.5 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 + 3.1.0-preview3.19561.7 From 0248d3c997bc5dd3ec72368af8bb1067ef423b12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 00:49:50 -0800 Subject: [PATCH 165/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191111.15 (#13057) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19561.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04729ca99439..be18ece86179 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 - + https://github.com/aspnet/AspNetCore - 2548e40f65ae5941fec3c99294604eba92f7ff80 + f75439c628c88373409c9d8c9e5832fc66a4e895 diff --git a/eng/Versions.props b/eng/Versions.props index 288350e90359..088d8def70cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19561.14 + 3.1.0-preview3.19561.15 From 5c88a2fa67aa90794ecefd22614bef1884618068 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 14:00:56 +0000 Subject: [PATCH 166/896] Update dependencies from https://github.com/dotnet/sdk build 20191112.1 (#13058) - Microsoft.NET.Sdk - 3.1.100-preview3.19562.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be18ece86179..fe540ee0f481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - f36a88342755978d934e02e6aa95b900d8b10961 + 8fc395319d7c5ed51ae8ab9bbeec2585d4a6c50e https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 088d8def70cb..871da7174067 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19561.5 + 3.1.100-preview3.19562.1 $(MicrosoftNETSdkPackageVersion) From 891c5e80f85d194c9011f0801a547d21706db389 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:00:49 +0000 Subject: [PATCH 167/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.2 (#13059) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19562.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe540ee0f481..f63e373cc3f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 - + https://github.com/aspnet/AspNetCore - f75439c628c88373409c9d8c9e5832fc66a4e895 + bdf9005be5815d883f2168836be826b86512bf72 diff --git a/eng/Versions.props b/eng/Versions.props index 871da7174067..acfc0fbf0df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19561.15 + 3.1.0-preview3.19562.2 From 29262aca9ab3491a4f8e6654905cf8bca6ada751 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 13:42:13 -0800 Subject: [PATCH 168/896] Update dependencies from https://github.com/dotnet/core-setup build 20191112.4 (#13060) - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac976fc2326a..b94785081bb2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63e373cc3f3..54435a83af7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,35 +5,35 @@ https://github.com/dotnet/templating 0e0e29c869d62d794ad74d75274ddf0ea542ac2b - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/core-setup - cfa9637c2a0066eb601cff1ebb52f479c7afb9a2 + b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 - + https://github.com/dotnet/corefx - e7c6e8fb23bb8d3b44aabbee0ad916fb0779f3e0 + 4703e4aefb6650500d00a2a529c7ad474ca89859 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index acfc0fbf0df7..4f1db0b9c9fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 + 3.1.0 + 3.1.0 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 - 3.1.0-preview3.19561.7 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 From f37aafb44013ad1dea06cc29be4d642e0bb9ed8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2019 14:11:06 -0800 Subject: [PATCH 169/896] Update dependencies from https://github.com/dotnet/sdk build 20191112.5 (#13061) - Microsoft.NET.Sdk - 3.1.100-preview3.19562.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54435a83af7a..194fd86802dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 8fc395319d7c5ed51ae8ab9bbeec2585d4a6c50e + ecf58238288fc2b2a5a1900193401c9d76894d40 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 4f1db0b9c9fd..8c3bcdbf30d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19562.1 + 3.1.100-preview3.19562.5 $(MicrosoftNETSdkPackageVersion) From 8bd2a846d98f5867f9dd0350715266953f1313e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 01:30:29 +0000 Subject: [PATCH 170/896] Update dependencies from https://github.com/dotnet/sdk build 20191112.7 (#13062) - Microsoft.NET.Sdk - 3.1.100-preview3.19562.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 194fd86802dd..31d6be2bd71d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - ecf58238288fc2b2a5a1900193401c9d76894d40 + 33442c014e5406bf0546a898b47f3c136fc5b4a5 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 8c3bcdbf30d4..70d44080169f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19562.5 + 3.1.100-preview3.19562.7 $(MicrosoftNETSdkPackageVersion) From 930ffec0a75978c21661adfcf75aab3b65c501e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 03:15:29 +0000 Subject: [PATCH 171/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.6 (#13063) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19562.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31d6be2bd71d..49443c776e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - bdf9005be5815d883f2168836be826b86512bf72 + 47ba4b07fb7425d7902437c6efba8be3a41475a9 diff --git a/eng/Versions.props b/eng/Versions.props index 70d44080169f..931e852226c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19562.2 + 3.1.0-preview3.19562.6 From 994a231ec9ddc328552bf00a90da3956254eb8a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 05:25:56 +0000 Subject: [PATCH 172/896] Update dependencies from https://github.com/dotnet/sdk build 20191112.8 (#13064) - Microsoft.NET.Sdk - 3.1.100-preview3.19562.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49443c776e46..ca317fe4993b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 33442c014e5406bf0546a898b47f3c136fc5b4a5 + 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 931e852226c1..aa1c40511e5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19562.7 + 3.1.100-preview3.19562.8 $(MicrosoftNETSdkPackageVersion) From 5974711ae5c2a1b24ae23199fd29e7756e592ef3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 16:44:41 +0000 Subject: [PATCH 173/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.9 (#13065) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19562.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca317fe4993b..739bc7f7fcea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - 47ba4b07fb7425d7902437c6efba8be3a41475a9 + d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 diff --git a/eng/Versions.props b/eng/Versions.props index aa1c40511e5d..8a6f457c4f56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19562.6 + 3.1.0-preview3.19562.9 From 062c4df522131a8bf39d88f09fe2437290c3edde Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 14 Nov 2019 17:04:55 -0800 Subject: [PATCH 174/896] Update PreReleaseVersionLabel to RTM (#13067) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a6f457c4f56..7b1ddbfa17d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3.1.100 - preview3 + rtm From fc88db0063d2c27c6ad74300c8f4ae2e041b2ab7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 01:05:57 +0000 Subject: [PATCH 175/896] Update dependencies from https://github.com/dotnet/sdk build 20191114.2 (#13066) - Microsoft.NET.Sdk - 3.1.100-preview3.19564.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 739bc7f7fcea..1d3eb8171c4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 14721ab65e7903c55c8ea1bdf9b9a2d9c686856b + 6042ba82a6a63804a30f048045bb80697c2a4706 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 7b1ddbfa17d5..2cc0aa9f63d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19562.8 + 3.1.100-preview3.19564.2 $(MicrosoftNETSdkPackageVersion) From 4a9332d5c91cea570737f63a083ca37f7dfd54fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 04:10:49 +0000 Subject: [PATCH 176/896] Update dependencies from https://github.com/dotnet/templating build 20191114.2 (#13068) - Microsoft.TemplateEngine.Cli - 3.1.0-rtm.19564.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d3eb8171c4c..c2db6ed0d749 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 0e0e29c869d62d794ad74d75274ddf0ea542ac2b + 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 2cc0aa9f63d4..73ac51fb3e45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-preview1.19561.1 + 3.1.0-rtm.19564.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From ef4cc26058f598b9c6e4c7d45f1757af2a3dd356 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 07:50:51 +0000 Subject: [PATCH 177/896] Update dependencies from https://github.com/dotnet/core-setup build 20191114.3 (#13069) - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index b94785081bb2..e9acd4d992a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2db6ed0d749..299d74ffa04c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,27 +7,27 @@ https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c https://github.com/dotnet/core-setup - b7dc9ed2f7ec52c7c3df94a89c7c3b22431c9d33 + 62b52b1f4b75a1edaf65825f3caad8e493d2a29c From 1da6aa6075ae1e5d807e05a036792de6a8dc54c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 08:37:01 +0000 Subject: [PATCH 178/896] Update dependencies from https://github.com/dotnet/sdk build 20191114.5 (#13070) - Microsoft.NET.Sdk - 3.1.100-rtm.19564.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 299d74ffa04c..d1d4260b703a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 6042ba82a6a63804a30f048045bb80697c2a4706 + 03fffbe484fed2bea52f00fb96cc8f714f272d4a https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 73ac51fb3e45..57ddb4b616e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-preview3.19564.2 + 3.1.100-rtm.19564.5 $(MicrosoftNETSdkPackageVersion) From 2d097fe3c5e25024de6ad3f43b19a137eff2e53f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 11:45:44 +0000 Subject: [PATCH 179/896] Update dependencies from https://github.com/dotnet/sdk build 20191115.1 (#13072) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1d4260b703a..0734c3965a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 03fffbe484fed2bea52f00fb96cc8f714f272d4a + 8144e208d87e504e2a00cff7fee65c94459631bd https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 57ddb4b616e6..e6caf6cfc0c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-rtm.19564.5 + 3.1.100-rtm.19565.1 $(MicrosoftNETSdkPackageVersion) From 3bb925020fd1926285acf5f4689136f36432a563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 12:45:41 +0000 Subject: [PATCH 180/896] Update dependencies from https://github.com/dotnet/core-setup build 20191114.4 (#13073) - Microsoft.NETCore.App.Ref - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NET.HostModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9acd4d992a3..0ae1de58971d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0734c3965a44..360892dd2845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,27 +7,27 @@ https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a https://github.com/dotnet/core-setup - 62b52b1f4b75a1edaf65825f3caad8e493d2a29c + bc2d90a1c6b23e4e64fc117baa531e14b9288b5a From 837649106b0ca1d08968411b8883d8c6c0ea1342 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 17:04:59 +0000 Subject: [PATCH 181/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191114.3 (#13071) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview3.19564.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 360892dd2845..e7419caf2316 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - d3ce83e1d8ffb5ea8f3cc05e2027973c95457e64 + 2139578cfdd746bb0035b8c77603102c4a56668e diff --git a/eng/Versions.props b/eng/Versions.props index e6caf6cfc0c2..641db52f5966 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19562.9 + 3.1.0-preview3.19564.3 From 9fec0d055148880f2faa9283e1f432ff5dddb380 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 17:25:30 +0000 Subject: [PATCH 182/896] Update dependencies from https://github.com/dotnet/sdk build 20191115.2 (#13074) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7419caf2316..4637ae1a45f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 8144e208d87e504e2a00cff7fee65c94459631bd + 0a6b1524e0db362735f056a4048b4d67005cc686 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 641db52f5966..48a5f07af3dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-rtm.19565.1 + 3.1.100-rtm.19565.2 $(MicrosoftNETSdkPackageVersion) From 07ace446d6fee7339a83fa23d647d75a0f79a109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 20:50:55 +0000 Subject: [PATCH 183/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191115.5 (#13075) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19565.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4637ae1a45f9..003bda13159a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4703e4aefb6650500d00a2a529c7ad474ca89859 - + https://github.com/aspnet/AspNetCore - 2139578cfdd746bb0035b8c77603102c4a56668e + 1f9b6e2183cf20722fc52d17f35a40f30b218e5b diff --git a/eng/Versions.props b/eng/Versions.props index 48a5f07af3dc..e4e5c6fd3577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-preview3.19564.3 + 3.1.0-rtm.19565.5 From 85cb21be3abbf7357918ddaff60067fec52fa2de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 03:08:33 +0000 Subject: [PATCH 184/896] Update dependencies from https://github.com/dotnet/core-setup build 20191115.2 (#3603) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19565.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.ProtectedData - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encoding.CodePages - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Resources.Extensions - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84ca0aec5a6f..c9151367d6cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9bada863d56..225550ea89db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ d2033e46d9b365c131f1c6b8becb6b7b23e74816 - + https://github.com/dotnet/wpf - af68b9cea7d449b1b95ba3899abe629f5d15b167 + 427fa56aed34cbbc5096aa6137e748054905507d https://github.com/NuGet/NuGet.Client @@ -60,19 +60,19 @@ https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 diff --git a/eng/Versions.props b/eng/Versions.props index a2b720d169ae..1e762fb46559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-preview2.19558.3 + 3.1.0-rtm.19565.1 From ee059293b7ce78da361e9743b129931668190e27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 19:12:22 -0800 Subject: [PATCH 185/896] Update dependencies from https://github.com/dotnet/cli build 20191115.5 (#3604) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19565.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 225550ea89db..220a52945f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 837649106b0ca1d08968411b8883d8c6c0ea1342 + 9fec0d055148880f2faa9283e1f432ff5dddb380 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1e762fb46559..ca86961c2c7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19565.4 + 3.1.100-rtm.19565.5 From 44aa4e67c216356ddfac71c890e3fb3590dfd9ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 19:57:08 -0800 Subject: [PATCH 186/896] Update dependencies from https://github.com/dotnet/core-setup build 20191115.2 (#13076) - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0ae1de58971d..e228c2b748b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 003bda13159a..57026c45c77d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,33 +7,33 @@ https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup - bc2d90a1c6b23e4e64fc117baa531e14b9288b5a + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/corefx - 4703e4aefb6650500d00a2a529c7ad474ca89859 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/aspnet/AspNetCore From 2ae49174c91f2fedd2e700734b2f338e6a741bc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 21:03:43 -0800 Subject: [PATCH 187/896] Update dependencies from https://github.com/dotnet/cli build 20191115.6 (#3605) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19565.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220a52945f19..e8f5f11803fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 9fec0d055148880f2faa9283e1f432ff5dddb380 + 44aa4e67c216356ddfac71c890e3fb3590dfd9ec https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ca86961c2c7c..378d084c7d09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19565.5 + 3.1.100-rtm.19565.6 From 0d6f54a9168828ec02739236693a981e7419cfe1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 05:40:28 +0000 Subject: [PATCH 188/896] Update dependencies from https://github.com/dotnet/sdk build 20191115.4 (#3606) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8f5f11803fa..2adb5b34f745 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 44aa4e67c216356ddfac71c890e3fb3590dfd9ec - + https://github.com/dotnet/sdk - 0a6b1524e0db362735f056a4048b4d67005cc686 + fc412c7e032c25a17da0e8ca4556b34897313d7c https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 378d084c7d09..287c03c45a3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.100-rtm.19565.2 + 3.1.100-rtm.19565.4 From 7376073fa16ccd22507c41ed5c833bbaaabfd536 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 22:12:38 -0800 Subject: [PATCH 189/896] Update dependencies from https://github.com/dotnet/templating build 20191115.2 (#13077) - Microsoft.TemplateEngine.Cli - 3.1.0-rtm.19565.2 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57026c45c77d..851c230d3dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,7 +1,7 @@ - + https://github.com/dotnet/templating 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 diff --git a/eng/Versions.props b/eng/Versions.props index e4e5c6fd3577..2c827159f6a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-rtm.19564.2 + 3.1.0-rtm.19565.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 896091f8b6d9eaab6a88bea9dc26caae8dca9147 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 22:12:54 -0800 Subject: [PATCH 190/896] Update dependencies from https://github.com/dotnet/sdk build 20191115.4 (#13078) - Microsoft.NET.Sdk - 3.1.100-rtm.19565.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 851c230d3dc3..5fbd0185c92e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - 0a6b1524e0db362735f056a4048b4d67005cc686 + fc412c7e032c25a17da0e8ca4556b34897313d7c https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2c827159f6a0..162640aaf974 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-rtm.19565.2 + 3.1.100-rtm.19565.4 $(MicrosoftNETSdkPackageVersion) From 55de01d7e84ab71b3e8a9b2698b5493c9792d3a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 07:35:30 +0000 Subject: [PATCH 191/896] Update dependencies from https://github.com/dotnet/cli build 20191115.7 (#3608) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19565.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adb5b34f745..ef352a0fc142 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 44aa4e67c216356ddfac71c890e3fb3590dfd9ec + 896091f8b6d9eaab6a88bea9dc26caae8dca9147 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 287c03c45a3c..bdade13b6290 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19565.6 + 3.1.100-rtm.19565.7 From a10e7ab6cb1a5560188d1c0fa26b1b60b68b838b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 23:42:51 -0800 Subject: [PATCH 192/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191115.5 (#3609) - Microsoft.NET.Sdk.Razor - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9151367d6cb..0f5975722922 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef352a0fc142..cd8750fa96cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://github.com/aspnet/AspNetCore-Tooling - d2033e46d9b365c131f1c6b8becb6b7b23e74816 + 29036777e7cd2172a81c45c69e0dc257e8b8184e From 56fe2cca1ad3b1e450ece97a226ce8a655d31271 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 15:10:50 +0000 Subject: [PATCH 193/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191116.1 (#13079) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19566.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fbd0185c92e..54a991dc65a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 1f9b6e2183cf20722fc52d17f35a40f30b218e5b + 2b7e994b8a304700a09617ffc5052f0d943bbcba diff --git a/eng/Versions.props b/eng/Versions.props index 162640aaf974..aeaa220be4a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19565.5 + 3.1.0-rtm.19566.1 From 883f0f3ab716a5d129f188816a6b3801ac16f91d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 16:11:18 +0000 Subject: [PATCH 194/896] Update dependencies from https://github.com/aspnet/websdk build 20191116.2 (#3612) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19566.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd8750fa96cd..631b78b03351 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 2dc99c98d332bce11263e32686e94cd49a22ba25 + 6ac9d49bc28ce976ffd92539e0c14d15d5b31c3a https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index bdade13b6290..0aabc1652a4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19565.1 + 3.1.100-rtm.19566.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 575b1c9f9636e57881fc41817d3f049dff6ff470 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2019 08:49:08 -0800 Subject: [PATCH 195/896] Update dependencies from https://github.com/dotnet/cli build 20191116.1 (#3613) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19566.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 631b78b03351..94c5237282e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 896091f8b6d9eaab6a88bea9dc26caae8dca9147 + 56fe2cca1ad3b1e450ece97a226ce8a655d31271 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0aabc1652a4d..c865b4473579 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19565.7 + 3.1.100-rtm.19566.1 From 0065e779a913c72162737715e543617da9b243db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 01:11:03 +0000 Subject: [PATCH 196/896] Update dependencies from https://github.com/dotnet/roslyn build 20191118.4 (#3624) - Microsoft.NETCore.Compilers - 3.4.0-beta4-19568-04 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94c5237282e0..aec8038f9363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp e7597deb7042710a7142bdccabd6f92b0840d354 - + https://github.com/dotnet/roslyn - ff930dec4565e2bc424ad3bf3e22ecb20542c87d + 82f2e2541478e239dc4b04f231e90dc2b3dcb422 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index c865b4473579..f39ff9f27b10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.0-beta4-19562-05 + 3.4.0-beta4-19568-04 From 2ceaf2027ebc2bbd50ea34d206c0f67b5f5e897b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 03:00:24 +0000 Subject: [PATCH 197/896] Update dependencies from https://github.com/dotnet/core-setup build 20191118.1 (#3626) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19568.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f5975722922..4813c5f14761 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aec8038f9363..87cc5ba0cf63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 29036777e7cd2172a81c45c69e0dc257e8b8184e - + https://github.com/dotnet/wpf - 427fa56aed34cbbc5096aa6137e748054905507d + 8bd2a19f55f6965bf6ee0f264b5987a8d4a486c7 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index f39ff9f27b10..5d0303b56e63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19565.1 + 3.1.0-rtm.19568.1 From f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 03:25:32 +0000 Subject: [PATCH 198/896] Update dependencies from https://github.com/dotnet/core-setup build 20191118.1 (#13081) - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..65ba4789a615 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54a991dc65a7..ca9a6a944321 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,27 +7,27 @@ https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 2b973fe4eaca6e181cf34e946a8878da3feaf07b From 5577982a26c6090e003fec233947324d4b59d19a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 03:40:40 +0000 Subject: [PATCH 199/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191118.5 (#3627) - Microsoft.NET.Sdk.Razor - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4813c5f14761..8f15f04f32dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87cc5ba0cf63..48d3229f0b73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://github.com/aspnet/AspNetCore-Tooling - 29036777e7cd2172a81c45c69e0dc257e8b8184e + 806f68f84d7ecf341811e317810f9aea0e1a862e From 97a620f12c375103d4232b315db26cb67f0e4d86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 04:35:21 +0000 Subject: [PATCH 200/896] Update dependencies from https://github.com/dotnet/cli build 20191118.1 (#3629) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19568.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48d3229f0b73..651abb43108d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 2b973fe4eaca6e181cf34e946a8878da3feaf07b - + https://github.com/dotnet/cli - 56fe2cca1ad3b1e450ece97a226ce8a655d31271 + f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d0303b56e63..85f7a924ce49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19566.1 + 3.1.100-rtm.19568.1 From acb6df24937ad190153de23a0292c5c3c319c718 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 06:00:21 +0000 Subject: [PATCH 201/896] Update dependencies from https://github.com/dotnet/sdk build 20191118.4 (#3630) - Microsoft.NET.Sdk - 3.1.100-rtm.19568.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 651abb43108d..7490bee3f2c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 - + https://github.com/dotnet/sdk - fc412c7e032c25a17da0e8ca4556b34897313d7c + 49bbede419cf63e15c70f4b463f80e4811fe3f34 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 85f7a924ce49..c226527e8216 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.100-rtm.19565.4 + 3.1.100-rtm.19568.4 From 846cbf8b4ff94d584e880454dd37ac2f496c1033 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 06:20:30 +0000 Subject: [PATCH 202/896] Update dependencies from https://github.com/dotnet/sdk build 20191118.4 (#13082) - Microsoft.NET.Sdk - 3.1.100-rtm.19568.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca9a6a944321..b715cbea2ed8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/sdk - fc412c7e032c25a17da0e8ca4556b34897313d7c + 49bbede419cf63e15c70f4b463f80e4811fe3f34 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index aeaa220be4a4..a4dba84c390e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-rtm.19565.4 + 3.1.100-rtm.19568.4 $(MicrosoftNETSdkPackageVersion) From 42b5b76ab570666badeab062852a9bc184dddcca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:15:22 +0000 Subject: [PATCH 203/896] Update dependencies from https://github.com/dotnet/cli build 20191118.2 (#3631) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19568.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7490bee3f2c6..c3f904aa8fdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 2b973fe4eaca6e181cf34e946a8878da3feaf07b - + https://github.com/dotnet/cli - f8b051906d69d8b1bde4e46e4d5b1f0c81b7f983 + 846cbf8b4ff94d584e880454dd37ac2f496c1033 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c226527e8216..da5387dcfa41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19568.1 + 3.1.100-rtm.19568.2 From bbd0834c1973c9b52af01551d035dbb5e8e6d33d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:35:24 +0000 Subject: [PATCH 204/896] Update dependencies from https://github.com/dotnet/core-setup build 20191118.2 (#3632) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19568.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f15f04f32dc..81213cb1f026 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3f904aa8fdf..aff813dcfc0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 806f68f84d7ecf341811e317810f9aea0e1a862e - + https://github.com/dotnet/wpf - 8bd2a19f55f6965bf6ee0f264b5987a8d4a486c7 + 7aac1f7396bfc03177b1fc85b7d4e49b5222b102 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index da5387dcfa41..e960404f36a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19568.1 + 3.1.0-rtm.19568.6 From cc6bdda9777fff833fe170e3006470e9409521cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:55:32 +0000 Subject: [PATCH 205/896] Update dependencies from https://github.com/dotnet/core-setup build 20191118.2 (#13083) - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65ba4789a615..e95f9d9b3f26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b715cbea2ed8..c68fa87478dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,27 +7,27 @@ https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 https://github.com/dotnet/core-setup - 2b973fe4eaca6e181cf34e946a8878da3feaf07b + 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 From 430dcf7a0ee89efa39f1283ed942c4dc4a89ff65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 08:50:22 +0000 Subject: [PATCH 206/896] Update dependencies from https://github.com/dotnet/cli build 20191118.3 (#3633) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19568.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aff813dcfc0d..13ef6b2f218a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 - + https://github.com/dotnet/cli - 846cbf8b4ff94d584e880454dd37ac2f496c1033 + cc6bdda9777fff833fe170e3006470e9409521cf https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e960404f36a3..701b46a49b73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19568.2 + 3.1.100-rtm.19568.3 From 7b4b17a223ca034925c156fda71e925a59b6dbe5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 09:05:20 +0000 Subject: [PATCH 207/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191119.1 (#3635) - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19569.1 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0edb1bf34b4a..33a1a18863a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ff4d25ed8a2..7e0c363d4967 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/aspnet/AspNetCore-Tooling - 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf + d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 diff --git a/eng/Versions.props b/eng/Versions.props index eedd12332d40..71c2eb2b5b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.0.1 + 3.0.2-servicing.19569.1 From 4e83fe248c14813a28569d4f4c153609650aa2a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 14:07:03 +0000 Subject: [PATCH 208/896] Update dependencies from https://github.com/aspnet/websdk build 20191119.1 (#3637) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19569.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13ef6b2f218a..c2a1ffbdaed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 6ac9d49bc28ce976ffd92539e0c14d15d5b31c3a + a1041655b92f65e492b7337786f235e0a1a4b731 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 701b46a49b73..c4729beee96c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19566.2 + 3.1.100-rtm.19569.1 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From a9b3b20eeba72c92abb18a6c4a1b374275b9f932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 18:35:29 +0000 Subject: [PATCH 209/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191119.3 (#13088) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.2-servicing.19569.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 725436bbad7a..b2969bd45f97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + 7891c8318f1026deb1c96054eebead058bb4f50f diff --git a/eng/Versions.props b/eng/Versions.props index a4ff39bc7a08..e6d342073136 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.0.0-rc2.19465.2 + 3.0.2-servicing.19569.3 From 08e00b1d6c510d20227a5d1a7c20abe49a751263 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 19:37:18 +0000 Subject: [PATCH 210/896] Update dependencies from https://github.com/dotnet/roslyn build 20191119.3 (#3640) - Microsoft.NETCore.Compilers - 3.4.0-beta4-19569-03 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a1ffbdaed5..5408e65c3d47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,7 +29,7 @@ https://github.com/dotnet/fsharp e7597deb7042710a7142bdccabd6f92b0840d354 - + https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 diff --git a/eng/Versions.props b/eng/Versions.props index c4729beee96c..e34f56b2c47e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.0-beta4-19568-04 + 3.4.0-beta4-19569-03 From 224f1cfbaf977c2d6c50b2b17ff33e8dde9ad14d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 20 Nov 2019 09:41:20 -0800 Subject: [PATCH 211/896] [release/3.0.1xx] Update branding for 3.0.102 (#3647) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 71c2eb2b5b7b..78d1084e2d24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.0.101 + 3.0.102 servicing From cc05a5a378baa9a67748b1269a2d0150ada66de2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 20 Nov 2019 09:53:26 -0800 Subject: [PATCH 212/896] [release/3.0.1xx] Update branding for 3.0.102 (#13093) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e6d342073136..2f2e4a20d039 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.0.101 + 3.0.102 servicing From 125d5b114ec2a3c83eeff83994b942d11a948ed1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 18:10:20 +0000 Subject: [PATCH 213/896] Update dependencies from https://github.com/aspnet/websdk build 20191118.2 (#3648) - Microsoft.NET.Sdk.Web - 3.0.102-servicing.19568.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e0c363d4967..051e2ca2e6cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 389b280e262b5f74e8d08cd5c784d4ba18e2fe4d + 34a35abd45789d017c86e3ac5b1b55fbfb48038b https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 78d1084e2d24..89a32e9e888e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.100-rc2.19554.4 + 3.0.102-servicing.19568.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From d17a22aa7676b8611ba43e1c274ee5fb7484102d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 18:45:23 +0000 Subject: [PATCH 214/896] Update dependencies from https://github.com/dotnet/cli build 20191120.1 (#3649) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19570.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 051e2ca2e6cc..debdd71976d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - 590f10ed02c0dc45d5cbed6105d25b0b80b6e4f7 + cc05a5a378baa9a67748b1269a2d0150ada66de2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 89a32e9e888e..8d119ea52415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.101-servicing.19561.1 + 3.0.102-servicing.19570.1 From 0f71c6575e7b7b3b173d8d3a2d9cbfe646891623 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 19:54:01 +0000 Subject: [PATCH 215/896] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#3650) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 +++- ...al-30.yml => generic-internal-channel.yml} | 25 ++-- ...ease-31.yml => generic-public-channel.yml} | 40 +++-- .../channels/netcore-3-tools-validation.yml | 95 ------------ .../post-build/channels/netcore-3-tools.yml | 130 ---------------- .../post-build/channels/netcore-dev-31.yml | 130 ---------------- .../post-build/channels/netcore-dev-5.yml | 130 ---------------- .../channels/netcore-release-30.yml | 130 ---------------- .../channels/netcore-tools-latest.yml | 130 ---------------- .../channels/netcore-tools-validation.yml | 95 ------------ .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 141 ++++++++++++++++-- global.json | 2 +- 14 files changed, 210 insertions(+), 882 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index debdd71976d0..c2c047d2ecbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419522..52e2ff021d70 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3571..68fdec029020 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7d4..c4bc1897d81f 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fcfc..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e750..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187d9..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb62..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29de..000000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9772..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af6f..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186c0..0a2c40c1035c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff183..ec80c65a923d 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 8dfbee84404f..3845b528dc45 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From 3b27357dbd4a4619e615bd2d3f1b2fe82117ecb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 20:30:19 +0000 Subject: [PATCH 216/896] Update dependencies from https://github.com/aspnet/websdk build 20191120.2 (#3651) - Microsoft.NET.Sdk.Web - 3.0.102-servicing.19570.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2c047d2ecbf..0d26473dac47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 34a35abd45789d017c86e3ac5b1b55fbfb48038b + 52036dea4c58cb553cc40ab8d05dba4167bcc833 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 8d119ea52415..c5a9b9c9d9d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.102-servicing.19568.2 + 3.0.102-servicing.19570.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 651f2eb74856e1305508781420725ae5decfad70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 21:08:14 +0000 Subject: [PATCH 217/896] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#3652) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 +++- ...al-30.yml => generic-internal-channel.yml} | 25 ++-- ...ease-31.yml => generic-public-channel.yml} | 40 +++-- .../channels/netcore-3-tools-validation.yml | 95 ------------ .../post-build/channels/netcore-3-tools.yml | 130 ---------------- .../post-build/channels/netcore-dev-31.yml | 130 ---------------- .../post-build/channels/netcore-dev-5.yml | 130 ---------------- .../channels/netcore-release-30.yml | 130 ---------------- .../channels/netcore-tools-latest.yml | 130 ---------------- .../channels/netcore-tools-validation.yml | 95 ------------ .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 141 ++++++++++++++++-- global.json | 2 +- 14 files changed, 210 insertions(+), 882 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5408e65c3d47..e7b45d418f73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419522..52e2ff021d70 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3571..68fdec029020 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7d4..c4bc1897d81f 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fcfc..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e750..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187d9..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb62..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29de..000000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9772..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af6f..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186c0..0a2c40c1035c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff183..ec80c65a923d 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index cbaea0728342..fe6dec5836e6 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From 5e804f307a61803e918ae19bde46c9491b58b433 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 21:16:14 +0000 Subject: [PATCH 218/896] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#13096) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 +++- ...al-30.yml => generic-internal-channel.yml} | 25 ++-- ...ease-31.yml => generic-public-channel.yml} | 40 +++-- .../channels/netcore-3-tools-validation.yml | 95 ------------ .../post-build/channels/netcore-3-tools.yml | 130 ---------------- .../post-build/channels/netcore-dev-31.yml | 130 ---------------- .../post-build/channels/netcore-dev-5.yml | 130 ---------------- .../channels/netcore-release-30.yml | 130 ---------------- .../channels/netcore-tools-latest.yml | 130 ---------------- .../channels/netcore-tools-validation.yml | 95 ------------ .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 141 ++++++++++++++++-- global.json | 2 +- 14 files changed, 210 insertions(+), 882 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2969bd45f97..57b47eb24313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419522..52e2ff021d70 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3571..68fdec029020 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7d4..c4bc1897d81f 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fcfc..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e750..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187d9..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb62..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29de..000000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9772..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af6f..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186c0..0a2c40c1035c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff183..ec80c65a923d 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 8dfbee84404f..3845b528dc45 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From 3adc2b99c60be57c5f85121986f2cb31aa09d8c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 21:40:20 +0000 Subject: [PATCH 219/896] Update dependencies from https://github.com/aspnet/websdk build 20191120.3 (#3653) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19570.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7b45d418f73..a7a081dc3f0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - a1041655b92f65e492b7337786f235e0a1a4b731 + bce20c8642d2f723578458a989a933a6202dc711 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index e34f56b2c47e..20cde2d27ecb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19569.1 + 3.1.100-rtm.19570.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From cd8a4a82a0c3bb887b5e90b8fd3aa87d3d156dd5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:20:20 +0000 Subject: [PATCH 220/896] Update dependencies from https://github.com/dotnet/cli build 20191120.2 (#3655) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19570.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d26473dac47..d2fbfe0148b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - cc05a5a378baa9a67748b1269a2d0150ada66de2 + 5e804f307a61803e918ae19bde46c9491b58b433 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c5a9b9c9d9d8..e3c6c846a4f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19570.1 + 3.0.102-servicing.19570.2 From fb03f1a77a04bf2db2b6aba9f1f65a1316320e9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:20:29 +0000 Subject: [PATCH 221/896] Update dependencies from https://github.com/dotnet/templating build 20191120.2 (#13098) - Microsoft.TemplateEngine.Cli - 3.1.0-rtm.19570.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c68fa87478dc..54e51ef76bb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 53a17fce7ce81aa68ddaa7b04f371dc6391d3497 + b275b18fd7014d67078e2477f693301ea04e6549 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index a4dba84c390e..fceabebec3de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-rtm.19565.2 + 3.1.0-rtm.19570.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From fcf7c320ac2ae70b83a61fb57c9a602eeebc3228 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:56:21 +0000 Subject: [PATCH 222/896] Update dependencies from https://github.com/dotnet/templating build 20191120.3 (#13099) - Microsoft.TemplateEngine.Cli - 3.0.1-servicing.19570.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57b47eb24313..272bcefff8b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - a776e417c83c52908298b3767e462feae8b18b98 + 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 2f2e4a20d039..7db3189f845b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.0.1-servicing.19476.1 + 3.0.1-servicing.19570.3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 91a2e02723bf9ce0cfc0d89f30afd220770cdb62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 23:35:22 +0000 Subject: [PATCH 223/896] Update dependencies from https://github.com/dotnet/cli build 20191120.4 (#3657) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19570.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7a081dc3f0c..b0e79591f106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 - + https://github.com/dotnet/cli - cc6bdda9777fff833fe170e3006470e9409521cf + fb03f1a77a04bf2db2b6aba9f1f65a1316320e9a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 20cde2d27ecb..4afffd5d8f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19568.3 + 3.1.100-rtm.19570.4 From 76ba37f7dd1c1e8f22a3e6aece372c3de2d2d937 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 00:00:54 +0000 Subject: [PATCH 224/896] Update dependencies from https://github.com/dotnet/cli build 20191120.5 (#3658) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19570.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2fbfe0148b3..70c300e83a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/dotnet/cli - 5e804f307a61803e918ae19bde46c9491b58b433 + fcf7c320ac2ae70b83a61fb57c9a602eeebc3228 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e3c6c846a4f9..6911b3dce440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19570.2 + 3.0.102-servicing.19570.5 From 4dfa04e8d78f3e021bfe57a8c0dac27345463b90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 00:25:39 +0000 Subject: [PATCH 225/896] Update dependencies from https://github.com/dotnet/core-setup build 20191120.3 (#3660) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 81213cb1f026..22a6de7d2873 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0e79591f106..67cf39b312e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + c16a31965d1ff8c4564d420610e2991265e77501 https://github.com/dotnet/cli From a8e75fb5884a888139e7ec81d1df4a6d1336c609 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 04:25:20 +0000 Subject: [PATCH 226/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191120.3 (#3661) - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19570.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70c300e83a79..e758d966f240 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/aspnet/AspNetCore-Tooling - d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 + e37c190d7dcec40b243f353dfcd0c586236f898a diff --git a/eng/Versions.props b/eng/Versions.props index 6911b3dce440..201d291da090 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.0.2-servicing.19569.1 + 3.0.2-servicing.19570.3 From 89eda101d837ee42e4cbffca3300a3e05b9f9e1f Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Nov 2019 10:15:26 -0800 Subject: [PATCH 227/896] Update branding to 3.1.200 preview1 --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fceabebec3de..b7f87abdc6a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ - 3.1.100 - rtm + 3.1.200 + preview1 From f3bc7e9aff92733c37b07d4964f315fcc889fb1a Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Nov 2019 10:19:42 -0800 Subject: [PATCH 228/896] Update branding to 3.1.200 preview1 --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4afffd5d8f2b..8e3f00042a7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ - 3.1.100 - rtm + 3.1.200 + preview1 From 1904886689dcc64ad9e165c637aed91e3ce7196a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 19:45:20 +0000 Subject: [PATCH 229/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.02 (#3664) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-02 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33a1a18863a9..fe88b30fe1cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e758d966f240..35fe8ab99fd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 201d291da090..e6a8202c6c97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.1 + 3.0.2-servicing-19571-02 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From fe03c281dfb7cacbda842e5235421d4f68f4cd86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 20:05:28 +0000 Subject: [PATCH 230/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.02 (#13103) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-02 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-02 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-02 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-02 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-02 --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index f45b6d82af9e..4a827fb8dad2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 272bcefff8b8..9546a2cdbdc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 diff --git a/eng/Versions.props b/eng/Versions.props index 7db3189f845b..a57a6810b1fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.1 + 3.0.2-servicing-19571-02 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 From 5bb1c537b3a9389e31036885facc6da209b00563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 20:55:48 +0000 Subject: [PATCH 231/896] Update dependencies from https://github.com/dotnet/cli build 20191121.2 (#3665) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19571.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35fe8ab99fd9..0e54fc402a09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/cli - fcf7c320ac2ae70b83a61fb57c9a602eeebc3228 + fe03c281dfb7cacbda842e5235421d4f68f4cd86 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e6a8202c6c97..7d0812ed2731 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19570.5 + 3.0.102-servicing.19571.2 From 75df017a8139ac2358e61f19acfe917033f61c37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 21:30:45 +0000 Subject: [PATCH 232/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191121.6 (#3666) - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19571.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e54fc402a09..1cb2ac65dd77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/aspnet/AspNetCore-Tooling - e37c190d7dcec40b243f353dfcd0c586236f898a + c983b8b39ca05c5bdcf2a3b34420225f3938f227 diff --git a/eng/Versions.props b/eng/Versions.props index 7d0812ed2731..e66146ea5e0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.0.2-servicing.19570.3 + 3.0.2-servicing.19571.6 From e7c87f4f568c1142bd3434b24a0783f91e11f2bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 23:35:18 +0000 Subject: [PATCH 233/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191121.8 (#3669) - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19571.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cb2ac65dd77..a408b61ad6f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/aspnet/AspNetCore-Tooling - c983b8b39ca05c5bdcf2a3b34420225f3938f227 + 4d61e71368214a87fb0807d93b70616a1d745b98 diff --git a/eng/Versions.props b/eng/Versions.props index e66146ea5e0c..e1084f4ebe47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.0.2-servicing.19571.6 + 3.0.2-servicing.19571.8 From 26003596b279cb59886ffb4e93f4bb968400cf5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 00:35:20 +0000 Subject: [PATCH 234/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.04 (#3670) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-04 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.0.1-servicing.19571.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a408b61ad6f2..358b42ac32c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 4d61e71368214a87fb0807d93b70616a1d745b98 - + https://github.com/dotnet/wpf - a4f24b6a7849ad33e29a50bd1d607f424953013b + f59734d7fe9bf8d9a165bdaefca20def2b373e1f https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index e1084f4ebe47..d1537b74ed09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.0.1-servicing.19510.3 + 3.0.1-servicing.19571.2 @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-04 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 1b609e394a5ec94be569e4ff78a8c12e8dc9809a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 00:55:27 +0000 Subject: [PATCH 235/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.04 (#13105) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-04 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-04 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-04 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-04 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-04 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9546a2cdbdc3..052b2e5f86f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 diff --git a/eng/Versions.props b/eng/Versions.props index a57a6810b1fa..2019a79e50c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-04 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 From c1106bc0aa13fbb411a237c826c7d23f6129f116 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 01:40:20 +0000 Subject: [PATCH 236/896] Update dependencies from https://github.com/dotnet/cli build 20191121.3 (#3671) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19571.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 358b42ac32c6..e82bcad11be3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/cli - fe03c281dfb7cacbda842e5235421d4f68f4cd86 + 1b609e394a5ec94be569e4ff78a8c12e8dc9809a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d1537b74ed09..e278cf7955ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19571.2 + 3.0.102-servicing.19571.3 From 63ee2429dfbed046bfa11dfeaf5f69adb1f25596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 02:00:24 +0000 Subject: [PATCH 237/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.5 (#3672) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19570.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22a6de7d2873..7d44749a820e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67cf39b312e9..29f1889d58f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/core-setup - c16a31965d1ff8c4564d420610e2991265e77501 + 4e1bb23ca12cfe3de0b7e834872ed7327377d420 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 806f68f84d7ecf341811e317810f9aea0e1a862e - + https://github.com/dotnet/wpf - 7aac1f7396bfc03177b1fc85b7d4e49b5222b102 + 67636428e8671ea15833016b462691530225035c https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 4afffd5d8f2b..cbfc683d8ace 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19568.6 + 3.1.0-rtm.19570.2 From f7d9487f9791599122cf478c3ad61accc2c509ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 02:35:20 +0000 Subject: [PATCH 238/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.06 (#3673) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-06 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.0.1-servicing.19571.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82bcad11be3..cd288413e451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 4d61e71368214a87fb0807d93b70616a1d745b98 - + https://github.com/dotnet/wpf - f59734d7fe9bf8d9a165bdaefca20def2b373e1f + fd11e071ec91058ccbcacb2f8fea1622e3418c23 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index e278cf7955ae..f4742d4e8c11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.0.1-servicing.19571.2 + 3.0.1-servicing.19571.3 @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-06 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 6197df6baacf56da50d57e8c159e062b15c32e0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 02:55:27 +0000 Subject: [PATCH 239/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.06 (#13107) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-06 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-06 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-06 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-06 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-06 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 052b2e5f86f5..37b641195826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a diff --git a/eng/Versions.props b/eng/Versions.props index 2019a79e50c0..8c5ba104e7fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-06 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 From 71ac6b23137a221d04c2fe6d7c07b2b9b7579108 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 03:41:15 +0000 Subject: [PATCH 240/896] Update dependencies from https://github.com/dotnet/cli build 20191121.4 (#3674) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19571.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd288413e451..2dbe7207452f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/cli - 1b609e394a5ec94be569e4ff78a8c12e8dc9809a + 6197df6baacf56da50d57e8c159e062b15c32e0a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f4742d4e8c11..306715b7c178 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19571.3 + 3.0.102-servicing.19571.4 From 6cf8fc4bfc6d790caf65f1f876ca18040ffa165c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 05:15:20 +0000 Subject: [PATCH 241/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.08 (#3675) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-08 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dbe7207452f..c90ef7ea4e95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 306715b7c178..24f0492601e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-08 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From bde0da3a340d287cd429f5a621905f7b2377276f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 05:35:28 +0000 Subject: [PATCH 242/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.08 (#13108) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-08 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-08 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-08 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-08 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-08 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37b641195826..6249d333d421 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 diff --git a/eng/Versions.props b/eng/Versions.props index 8c5ba104e7fc..9bcbeacfc2ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-08 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 From 97685707f0167235a973f7b282092b666da1b107 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 06:16:15 +0000 Subject: [PATCH 243/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191121.9 (#3676) - Microsoft.NET.Sdk.Razor - 3.1.0 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d44749a820e..0b8964645e98 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29f1889d58f0..8a0676edced1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://github.com/aspnet/AspNetCore-Tooling - 806f68f84d7ecf341811e317810f9aea0e1a862e + 574d72c659f2b742de703f8de633c85984c4e87d From 7ea3bc7d624aa02da3e7ea9857de4fe2255c6476 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 06:25:20 +0000 Subject: [PATCH 244/896] Update dependencies from https://github.com/dotnet/cli build 20191121.5 (#3677) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19571.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c90ef7ea4e95..9f1660fb7e16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/cli - 6197df6baacf56da50d57e8c159e062b15c32e0a + bde0da3a340d287cd429f5a621905f7b2377276f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 24f0492601e9..74d37b733ecb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19571.4 + 3.0.102-servicing.19571.5 From df074780875c54d38352c9b49aa24a36f92f3b65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 08:00:21 +0000 Subject: [PATCH 245/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.09 (#3678) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-09 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f1660fb7e16..e2ce402ebbcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 74d37b733ecb..b65ec3f12140 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-09 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 3e0bda2f22a69320cb02a520667a220b7b7a0f82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 08:40:37 +0000 Subject: [PATCH 246/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.09 (#13109) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-09 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-09 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-09 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-09 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-09 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6249d333d421..b223442a4088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 diff --git a/eng/Versions.props b/eng/Versions.props index 9bcbeacfc2ce..308d4b16e245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-09 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 From e41e391dd5a50cc8e9e68266deb989b13945d7a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 09:30:21 +0000 Subject: [PATCH 247/896] Update dependencies from https://github.com/dotnet/cli build 20191122.1 (#3679) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19572.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2ce402ebbcb..af9d1adeb5f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/cli - bde0da3a340d287cd429f5a621905f7b2377276f + 3e0bda2f22a69320cb02a520667a220b7b7a0f82 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b65ec3f12140..75578782317b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19571.5 + 3.0.102-servicing.19572.1 From 9eb290a0b7ff0e7b606cf6ede830745f83f83549 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 09:45:21 +0000 Subject: [PATCH 248/896] Update dependencies from https://github.com/dotnet/core-setup build 20191121.10 (#3680) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af9d1adeb5f9..6d34e6c38c15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 75578782317b..0228385d95b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From fa3e6b315583a6e56169d7d9eed7d218e77bfef7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 12:05:21 +0000 Subject: [PATCH 249/896] Update dependencies from https://github.com/dotnet/core-setup build 20191122.01 (#3681) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d34e6c38c15..c63f177407e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 0228385d95b9..07bd8f28d3c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19571-10 + 3.0.2-servicing-19572-01 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 1c8612658a36f9252c68bd948bd35ec17bb768c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 19:25:29 +0000 Subject: [PATCH 250/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191122.1 (#3685) - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19572.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c63f177407e2..d0c3e923ec4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/aspnet/AspNetCore-Tooling - 4d61e71368214a87fb0807d93b70616a1d745b98 + 3d6c6a7ea5db32db5fb510141b26e58138f79206 diff --git a/eng/Versions.props b/eng/Versions.props index 07bd8f28d3c1..f3f1d8ee66d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.0.2-servicing.19571.8 + 3.0.2-servicing.19572.1 From 56a477505dcc65660487ff9c12282527e6444468 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 22 Nov 2019 12:44:56 -0800 Subject: [PATCH 251/896] update branding 3.1.101 servicing --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fceabebec3de..8be9d4f0d55a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ - 3.1.100 - rtm + 3.1.101 + servicing From cb27d12b39e28ebc048e5d2adf5319e4d1bd8ecc Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 22 Nov 2019 13:17:10 -0800 Subject: [PATCH 252/896] update branding 3.1.101 servicing --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index cbfc683d8ace..37adaccc5634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ - 3.1.100 - rtm + 3.1.101 + servicing From 6f7ce8fd8578259f8acf789a12133b4b8c8e7ae8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 22:10:19 +0000 Subject: [PATCH 253/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191122.2 (#3687) - Microsoft.NET.Sdk.Razor - 3.1.0-rtm.19572.2 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b8964645e98..9ee043f89379 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a0676edced1..06796466e130 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 574d72c659f2b742de703f8de633c85984c4e87d + 8ff1667d7a790eb5a97f4dd385596b19c99c358b diff --git a/eng/Versions.props b/eng/Versions.props index cbfc683d8ace..34e5ac048fff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.0 + 3.1.0-rtm.19572.2 From 839656121558dc5f83dd5bac0b3d850fd6eb165e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 15:14:19 -0800 Subject: [PATCH 254/896] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#13097) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 +++- ...al-30.yml => generic-internal-channel.yml} | 25 ++-- ...ease-31.yml => generic-public-channel.yml} | 40 +++-- .../channels/netcore-3-tools-validation.yml | 95 ------------ .../post-build/channels/netcore-3-tools.yml | 130 ---------------- .../post-build/channels/netcore-dev-31.yml | 130 ---------------- .../post-build/channels/netcore-dev-5.yml | 130 ---------------- .../channels/netcore-release-30.yml | 130 ---------------- .../channels/netcore-tools-latest.yml | 130 ---------------- .../channels/netcore-tools-validation.yml | 95 ------------ .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 141 ++++++++++++++++-- global.json | 2 +- 14 files changed, 210 insertions(+), 882 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54e51ef76bb7..b5e5e78538a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419522..52e2ff021d70 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3571..68fdec029020 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7d4..c4bc1897d81f 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fcfc..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e750..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187d9..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb62..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29de..000000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9772..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af6f..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186c0..0a2c40c1035c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff183..ec80c65a923d 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index cbaea0728342..fe6dec5836e6 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From fb473a9057e215069b655aa04a9aba761619aa49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 00:46:37 +0000 Subject: [PATCH 255/896] Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#3689) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 2 +- 4 files changed, 86 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06796466e130..7cf7fd3aea18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c1035c..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a923d..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index fe6dec5836e6..8d3423abde7f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From a6b83c9e4f6ad6e31c7a7eb50246ea8cc879ed13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 02:40:05 +0000 Subject: [PATCH 256/896] Update dependencies from https://github.com/dotnet/cli build 20191122.2 (#3691) - Microsoft.DotNet.Cli.Runtime - 3.1.100-rtm.19572.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cf7fd3aea18..411db6d581da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 4e1bb23ca12cfe3de0b7e834872ed7327377d420 - + https://github.com/dotnet/cli - fb03f1a77a04bf2db2b6aba9f1f65a1316320e9a + 839656121558dc5f83dd5bac0b3d850fd6eb165e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a6f1308b3696..bdbe2953d71b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19570.4 + 3.1.100-rtm.19572.2 From dd6a30377fa5f7c172891e2f7ee08089ca13fcb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 02:50:26 +0000 Subject: [PATCH 257/896] Update dependencies from https://github.com/dotnet/cli build 20191122.3 (#3692) - Microsoft.DotNet.Cli.Runtime - 3.1.101-servicing.19572.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 411db6d581da..be87f78b6d4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 4e1bb23ca12cfe3de0b7e834872ed7327377d420 - + https://github.com/dotnet/cli - 839656121558dc5f83dd5bac0b3d850fd6eb165e + 0e5712bd568bb17296171cf7f6bc31ecf414b0c0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index bdbe2953d71b..041cd2174f42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-rtm.19572.2 + 3.1.101-servicing.19572.3 From 7653c554e7c61b6e1883814e53ec818b6d4060a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 03:00:18 +0000 Subject: [PATCH 258/896] Update dependencies from https://github.com/aspnet/websdk build 20191122.4 (#3694) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19572.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be87f78b6d4c..008856446fe9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - bce20c8642d2f723578458a989a933a6202dc711 + 757b219afada1393f133d9620ab2f5ac35e5f93f https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 041cd2174f42..9bff5c4d2a6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19570.3 + 3.1.100-rtm.19572.4 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 5fce06c43529bbb8590af530ae8cdc652fdac9e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 03:01:40 +0000 Subject: [PATCH 259/896] Update dependencies from https://github.com/aspnet/websdk build 20191122.5 (#3693) - Microsoft.NET.Sdk.Web - 3.0.102-servicing.19572.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0c3e923ec4a..d3e32592bb4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 52036dea4c58cb553cc40ab8d05dba4167bcc833 + 0baa6b15cfff95f76b087dfbcac2ff23b621925b https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index f3f1d8ee66d0..320b03944e27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.0.102-servicing.19570.2 + 3.0.102-servicing.19572.5 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From ec7a15e3d3a9305fe844c19e55026445cde12f77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 03:32:44 +0000 Subject: [PATCH 260/896] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#13084) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191119.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19569.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191121.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19571.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19572.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e5e78538a9..91b722ce1e35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + 6902b14471fca81af0854696b335bef198d38dfd diff --git a/eng/Versions.props b/eng/Versions.props index 8be9d4f0d55a..0cff7e6b713c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19566.1 + 3.1.0-rtm.19572.12 From 4bc7c1c52e5da0468ff8842b11ccb91a65581f66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 04:00:23 +0000 Subject: [PATCH 261/896] Update dependencies from https://github.com/dotnet/core-setup build 20191122.05 (#3696) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-05 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3e32592bb4d..26e5d9cff7d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 320b03944e27..510183b85449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-05 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 3d8a73d1e94c8aca36ba5c19975f761de10d3fd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 04:05:37 +0000 Subject: [PATCH 262/896] Update dependencies from https://github.com/aspnet/websdk build 20191122.6 (#3697) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19572.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 008856446fe9..83feadd48b1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 757b219afada1393f133d9620ab2f5ac35e5f93f + c9ff8f6fec15bd43078710798acb6927ef2684f2 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 9bff5c4d2a6b..be13e3528784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19572.4 + 3.1.100-rtm.19572.6 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From cb72305831df077a78b5c3893eaac2971d2df7d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 04:13:45 +0000 Subject: [PATCH 263/896] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#13110) * Update dependencies from https://github.com/dotnet/core-setup build 20191121.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-10 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-10 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19571-10 - Microsoft.NET.HostModel - 3.0.2-servicing-19571-10 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19571-10 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.01 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-01 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-01 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19572-01 - Microsoft.NET.HostModel - 3.0.2-servicing-19572-01 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-01 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.05 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-05 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-05 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19572-05 - Microsoft.NET.HostModel - 3.0.2-servicing-19572-05 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-05 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b223442a4088..e907ae51eddd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 diff --git a/eng/Versions.props b/eng/Versions.props index 308d4b16e245..3fd7b98eba03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19571-09 + 3.0.2-servicing-19572-05 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 From 9eb7c48df2b235922fe1a43461ce4dd614e6d682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 04:45:20 +0000 Subject: [PATCH 264/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191122.6 (#3698) - Microsoft.NET.Sdk.Razor - 3.1.0-rtm.19572.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83feadd48b1c..e81d561b861b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 8ff1667d7a790eb5a97f4dd385596b19c99c358b + e3ff082cf0ea5670905b202f82364397501fcb53 diff --git a/eng/Versions.props b/eng/Versions.props index be13e3528784..df70e7c8498c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.0-rtm.19572.2 + 3.1.0-rtm.19572.6 From 1e97f71e3bebde4d4abb058b0565c70a767e38ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:20:20 +0000 Subject: [PATCH 265/896] Update dependencies from https://github.com/dotnet/cli build 20191122.5 (#3700) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19572.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26e5d9cff7d1..918d039d8fc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/cli - 3e0bda2f22a69320cb02a520667a220b7b7a0f82 + cb72305831df077a78b5c3893eaac2971d2df7d1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 510183b85449..928e3eb969fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19572.1 + 3.0.102-servicing.19572.5 From 8c8ab4642a1f57ff7264c9ab27f3c1b41bc18242 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:40:08 +0000 Subject: [PATCH 266/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13102) * Update dependencies from https://github.com/dotnet/core-setup build 20191120.3 - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 * Update dependencies from https://github.com/dotnet/core-setup build 20191121.5 - Microsoft.NET.HostModel - 3.1.0 - Microsoft.Extensions.DependencyModel - 3.1.0 - Microsoft.DotNet.PlatformAbstractions - 3.1.0 - Microsoft.NETCore.DotNetHostResolver - 3.1.0 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0 - Microsoft.NETCore.App.Ref - 3.1.0 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.6 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.6 - Microsoft.DotNet.PlatformAbstractions - 3.1.1-servicing.19572.6 - Microsoft.NET.HostModel - 3.1.1-servicing.19572.6 - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19572.6 --- NuGet.config | 1 - eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index e95f9d9b3f26..283ad6849da4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91b722ce1e35..3f24d889d5a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating b275b18fd7014d67078e2477f693301ea04e6549 - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad - + https://github.com/dotnet/core-setup - 93ee64d467eeccd7006e370e78cf6dae31c1f3e2 + 97a18215497e8b54d0773452b2d77802657b7fad diff --git a/eng/Versions.props b/eng/Versions.props index 0cff7e6b713c..ead74afb59b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.0 - 3.1.0 + 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.0 - 3.1.0 - 3.1.0 - 3.1.0 + 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.6 From 836ab6d0f205a2116773937107c98e973de47e28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:45:26 +0000 Subject: [PATCH 267/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.16 (#13115) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19572.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f24d889d5a2..7544a81c58cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 6902b14471fca81af0854696b335bef198d38dfd + 9fded4c4aad794c7bb1152375a2eff092bb52a86 diff --git a/eng/Versions.props b/eng/Versions.props index ead74afb59b5..41e8d5e53cff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19572.12 + 3.1.0-rtm.19572.16 From ffd846fe03c71b6df2757163dc400fc92b5c6575 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 06:10:23 +0000 Subject: [PATCH 268/896] Update dependencies from https://github.com/dotnet/core-setup build 20191122.07 (#3701) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-07 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 918d039d8fc8..01c956092e04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 928e3eb969fd..f849d5dd6883 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-07 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From fc6f9d01e722b49461773dc5cf140566bcceabf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 06:15:20 +0000 Subject: [PATCH 269/896] Update dependencies from https://github.com/aspnet/websdk build 20191122.7 (#3702) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19572.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e81d561b861b..f3327a476c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - c9ff8f6fec15bd43078710798acb6927ef2684f2 + 2c5c2912dec72569b922051c049221ef2e472346 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index df70e7c8498c..d9a6865407df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19572.6 + 3.1.100-rtm.19572.7 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 91879a753e3347e105f58e05ba886e6ab3632c2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 07:25:27 +0000 Subject: [PATCH 270/896] Update dependencies from https://github.com/dotnet/core-setup build 20191122.8 (#13117) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.8 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.8 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.8 - Microsoft.DotNet.PlatformAbstractions - 3.1.1-servicing.19572.8 - Microsoft.NET.HostModel - 3.1.1-servicing.19572.8 - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19572.8 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7544a81c58cb..6bf2f3bd3828 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating b275b18fd7014d67078e2477f693301ea04e6549 - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc - + https://github.com/dotnet/core-setup - 97a18215497e8b54d0773452b2d77802657b7fad + 9541fa09c354ea9288db00b8c1b95a34a3abdcdc diff --git a/eng/Versions.props b/eng/Versions.props index 41e8d5e53cff..f8763d37264e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.1-servicing.19572.6 - 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19572.6 - 3.1.1-servicing.19572.6 - 3.1.1-servicing.19572.6 - 3.1.1-servicing.19572.6 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 + 3.1.1-servicing.19572.8 From 3d0995e7163408405bed3825155ed3bee36941cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 07:45:21 +0000 Subject: [PATCH 271/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191122.7 (#3705) - Microsoft.NET.Sdk.Razor - 3.1.0-rtm.19572.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3327a476c75..47720b5547af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - e3ff082cf0ea5670905b202f82364397501fcb53 + 94fc0f28a5caf46c7c1d09ac2d6d4398c680dc72 diff --git a/eng/Versions.props b/eng/Versions.props index d9a6865407df..5292d8ca5073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.0-rtm.19572.6 + 3.1.0-rtm.19572.7 From 67845a5815245c1e2b1d0a1bc21690878b0b2bad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 07:55:23 +0000 Subject: [PATCH 272/896] Update dependencies from https://github.com/dotnet/core-setup build 20191122.09 (#3706) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-09 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.0.1-servicing.19572.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01c956092e04..fd2f0393213f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/dotnet/wpf - fd11e071ec91058ccbcacb2f8fea1622e3418c23 + 906bf50af904c13a9ff42cbd1a475be0f7a3cc6c https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index f849d5dd6883..76f00360ec04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.0.1-servicing.19571.3 + 3.0.1-servicing.19572.5 @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-09 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From f8ae9c892d145680eac10074d4ed3c924d47708b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:11:12 +0000 Subject: [PATCH 273/896] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#13116) * Update dependencies from https://github.com/dotnet/core-setup build 20191122.07 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-07 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-07 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19572-07 - Microsoft.NET.HostModel - 3.0.2-servicing-19572-07 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-07 * Update dependencies from https://github.com/dotnet/core-setup build 20191122.09 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-09 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-09 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19572-09 - Microsoft.NET.HostModel - 3.0.2-servicing-19572-09 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-09 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e907ae51eddd..ab054aab2a97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 diff --git a/eng/Versions.props b/eng/Versions.props index 3fd7b98eba03..ff35496ff82d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-09 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 From fa161476241d03c1821e4b843adf126f98cf34fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:20:26 +0000 Subject: [PATCH 274/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.19 (#13118) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19572.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bf2f3bd3828..04a12955536a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 9fded4c4aad794c7bb1152375a2eff092bb52a86 + 814f3bd24b68db6881273d1639673842d697486e diff --git a/eng/Versions.props b/eng/Versions.props index f8763d37264e..b7a284662c0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19572.16 + 3.1.0-rtm.19572.19 From 1ee3d2b981bf8f8ac24e8b768264cc20e639b1bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:40:18 +0000 Subject: [PATCH 275/896] Update dependencies from https://github.com/aspnet/websdk build 20191123.1 (#3707) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19573.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47720b5547af..e2c626829793 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 2c5c2912dec72569b922051c049221ef2e472346 + a0a9dcdfa46f19b9e754bfb4f15a6d5097b3dcce https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 5292d8ca5073..e6adb30f2027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19572.7 + 3.1.100-rtm.19573.1 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From d413623d6498c9fff98e8c2781397d3cc3a97d4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 09:15:22 +0000 Subject: [PATCH 276/896] Update dependencies from https://github.com/dotnet/cli build 20191123.1 (#3708) - Microsoft.DotNet.Cli.Runtime - 3.0.102-servicing.19573.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd2f0393213f..3192f3a64217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/cli - cb72305831df077a78b5c3893eaac2971d2df7d1 + f8ae9c892d145680eac10074d4ed3c924d47708b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 76f00360ec04..7f198a1289f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.102-servicing.19572.5 + 3.0.102-servicing.19573.1 From 393c2ce6184408eaa93c46d0f52c5aec590eaece Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 09:35:17 +0000 Subject: [PATCH 277/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191123.1 (#3709) - Microsoft.NET.Sdk.Razor - 3.1.0-rtm.19573.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2c626829793..db0c1229c985 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 94fc0f28a5caf46c7c1d09ac2d6d4398c680dc72 + abd3c17b317dbe455b18a4f5937c43e0fc7a2944 diff --git a/eng/Versions.props b/eng/Versions.props index e6adb30f2027..f6453ee4bc32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.0-rtm.19572.7 + 3.1.0-rtm.19573.1 From 958109e7d91abce0d6d89531cf6da70f9d4b868a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 22:10:25 +0000 Subject: [PATCH 278/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191123.3 (#13119) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19573.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a12955536a..f8afd9deb8ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 814f3bd24b68db6881273d1639673842d697486e + c31f51e5c778dc817862d0c932e7cfe9223d4899 diff --git a/eng/Versions.props b/eng/Versions.props index b7a284662c0e..1f687394c7f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19572.19 + 3.1.0-rtm.19573.3 From 0b743c9836ed8354cf366cd29a1b8101c06fed4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 22:45:18 +0000 Subject: [PATCH 279/896] Update dependencies from https://github.com/aspnet/websdk build 20191123.3 (#3712) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19573.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db0c1229c985..cbc8a8404fb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - a0a9dcdfa46f19b9e754bfb4f15a6d5097b3dcce + 7b126c612ff89290c7b5be0a682a43f21517e1af https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index f6453ee4bc32..18cefe47a528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19573.1 + 3.1.100-rtm.19573.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From fba84c3ed24fe8e99510affb61cf823022a3e3a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 16:00:22 +0000 Subject: [PATCH 280/896] Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#13113) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 2 +- 4 files changed, 86 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8afd9deb8ef..3151ddd14e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c1035c..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a923d..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index fe6dec5836e6..8d3423abde7f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From 6d628ed7e81cf5e246e296016cf8a01f2191ef04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 20:15:20 +0000 Subject: [PATCH 281/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191125.2 (#3717) - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19575.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbc8a8404fb5..83ac69e9f641 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - abd3c17b317dbe455b18a4f5937c43e0fc7a2944 + c6873434af03c98f320f060b73e5fa3b489a1300 diff --git a/eng/Versions.props b/eng/Versions.props index 18cefe47a528..c7693e494aa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.0-rtm.19573.1 + 3.1.1-servicing.19575.2 From 09ad82985f55a36851bacec2119d9edeb6685945 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 21:00:19 +0000 Subject: [PATCH 282/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191125.5 (#3718) - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19575.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83ac69e9f641..b2f7feccc6ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - c6873434af03c98f320f060b73e5fa3b489a1300 + 825e616ef1ccccd57fb172d4d9fcd2b82569dda0 diff --git a/eng/Versions.props b/eng/Versions.props index c7693e494aa0..7fb3ce10c4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19575.2 + 3.1.1-servicing.19575.5 From e488d4fac346a1f7458cce78c954a53a1da793e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 22:15:21 +0000 Subject: [PATCH 283/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191125.7 (#3720) - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19575.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2f7feccc6ca..d117169be497 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 825e616ef1ccccd57fb172d4d9fcd2b82569dda0 + 244e60685c0aacce0d84f9e3eb6a6d234c24fcf7 diff --git a/eng/Versions.props b/eng/Versions.props index 7fb3ce10c4d1..b480f792d742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19575.5 + 3.1.1-servicing.19575.7 From dfa408ccf4fc4c9d954c2aa8aa20a0f0764a6836 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:00:22 +0000 Subject: [PATCH 284/896] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191125.9 (#3721) - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19575.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d117169be497..5d6eae645b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 244e60685c0aacce0d84f9e3eb6a6d234c24fcf7 + 5a489a79189da32e5046c3eeda5f80c4e1258cb8 diff --git a/eng/Versions.props b/eng/Versions.props index b480f792d742..0b621d7a7440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19575.7 + 3.1.1-servicing.19575.9 From c09b2ef48059a0620a12162d4be6fa4a8a15c0fd Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 25 Nov 2019 17:27:58 -0800 Subject: [PATCH 285/896] Add trigger for internal builds (#13122) * Add trigger for internal builds * Fix trigger --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c2fe31248318..0cae6999272e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,6 +1,7 @@ trigger: - master - release/* +- internal/release/3.* variables: - name: _TeamName From 26bbb01fffd0ee4b1e5db79b4020c8ee7c6bb770 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 25 Nov 2019 17:28:09 -0800 Subject: [PATCH 286/896] Add trigger for internal builds (#3719) * Add trigger for internal builds * Fix trigger --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2958fc57b2a3..a48287e2c7f5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,6 +1,7 @@ trigger: - master - release/* +- internal/release/3.* variables: - name: _TeamName From 597688dfa01a77b8f502bfea9d79feecfc63e33d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 05:40:43 +0000 Subject: [PATCH 287/896] Update dependencies from https://github.com/aspnet/websdk build 20191125.2 (#3723) - Microsoft.NET.Sdk.Web - 3.1.100-rtm.19575.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d6eae645b1d..3d1b00c9e67a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 7b126c612ff89290c7b5be0a682a43f21517e1af + 72a4eb78f1aa8af48f6fd7441fccea38639d9d6d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 0b621d7a7440..457ae94d94e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19573.3 + 3.1.100-rtm.19575.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 295f543afd41bdfd28c7d65c04b8c3a8b2b73538 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 16:09:35 +0000 Subject: [PATCH 288/896] Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#3690) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 4 +- 4 files changed, 87 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3192f3a64217..74e5f522a760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c1035c..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a923d..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 3845b528dc45..efd899b588cf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100", + "dotnet": "3.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From 4ff900a340e81089e49952ae0673c9480f374ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 16:32:15 +0000 Subject: [PATCH 289/896] [release/3.0.1xx] Update dependencies from dotnet/arcade (#13114) * Update dependencies from https://github.com/dotnet/arcade build 20191122.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 * Update LKG version --- eng/Version.Details.xml | 4 +- eng/Versions.props | 2 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 4 +- 5 files changed, 88 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab054aab2a97..b1930bff70be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/Versions.props b/eng/Versions.props index ff35496ff82d..8c807854ab3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.0.100 + 3.0.101 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c1035c..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a923d..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 3845b528dc45..efd899b588cf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100", + "dotnet": "3.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From f6aa104e3f4b48a036314325a06ebe8179c7cde1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 22:05:21 +0000 Subject: [PATCH 290/896] Update dependencies from https://github.com/dotnet/core-setup build 20191126.03 (#3727) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e5f522a760..781061ef836d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 7f198a1289f5..e90433621d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-03 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From e20e3d865be8defe28704da05f5804b5325836ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 22:25:31 +0000 Subject: [PATCH 291/896] Update dependencies from https://github.com/dotnet/core-setup build 20191126.03 (#13125) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-03 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19576-03 - Microsoft.DotNet.PlatformAbstractions - 3.0.2-servicing-19576-03 - Microsoft.NET.HostModel - 3.0.2-servicing-19576-03 - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19576-03 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1930bff70be..206dd2a62951 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,25 +9,25 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 diff --git a/eng/Versions.props b/eng/Versions.props index 8c807854ab3f..7cb35cc81b58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.0.0 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-03 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 From 680d9f9367971a6a8f2fd7398a14b7a6e994a8fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 23:33:18 +0000 Subject: [PATCH 292/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13121) * Update dependencies from https://github.com/dotnet/core-setup build 20191125.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19575.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19575.1 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19575.1 - Microsoft.DotNet.PlatformAbstractions - 3.1.1-servicing.19575.1 - Microsoft.NET.HostModel - 3.1.1-servicing.19575.1 - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19575.1 * Update dependencies from https://github.com/dotnet/core-setup build 20191126.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.4 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.4 - Microsoft.DotNet.PlatformAbstractions - 3.1.1-servicing.19576.4 - Microsoft.NET.HostModel - 3.1.1-servicing.19576.4 - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19576.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3151ddd14e51..74515bbfafdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating b275b18fd7014d67078e2477f693301ea04e6549 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c diff --git a/eng/Versions.props b/eng/Versions.props index 1f687394c7f6..e37f71ff1a0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.4 From cdaf3fbfbc08fa3c2f190a4c6e479e1fb050e15a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2019 00:15:23 +0000 Subject: [PATCH 293/896] Update dependencies from https://github.com/dotnet/core-setup build 20191126.05 (#3728) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-05 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 781061ef836d..404854884283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e90433621d12..ec8fae13cf75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-05 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From da675e5b5bbfd3f50c9f8f1a2e00d8b25ca9d8b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2019 01:15:28 +0000 Subject: [PATCH 294/896] Update dependencies from https://github.com/dotnet/core-setup build 20191126.7 (#13127) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.7 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.7 - Microsoft.DotNet.PlatformAbstractions - 3.1.1-servicing.19576.7 - Microsoft.NET.HostModel - 3.1.1-servicing.19576.7 - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19576.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74515bbfafdd..d658942d9363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating b275b18fd7014d67078e2477f693301ea04e6549 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + 3175a035df26e4082ad5513be661400ce722d0f5 diff --git a/eng/Versions.props b/eng/Versions.props index e37f71ff1a0c..867116e7dd4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,13 +17,13 @@ - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.7 + 3.1.1-servicing.19576.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.7 + 3.1.1-servicing.19576.7 + 3.1.1-servicing.19576.7 + 3.1.1-servicing.19576.7 From 40f2fec64789f32a911fc8c9b1328ad40f668396 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2019 09:32:27 -0800 Subject: [PATCH 295/896] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#3739) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 404854884283..037db093c305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000000..2cb40c29474b --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000000..126452131710 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index efd899b588cf..cd9847341a4f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 139c0c2516f0fae4a445ea326b494647fe66d06b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2019 09:33:24 -0800 Subject: [PATCH 296/896] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#3738) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d1b00c9e67a..78a247dc6469 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000000..2cb40c29474b --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000000..126452131710 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index 8d3423abde7f..9462add2c278 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From d9656b143c08d40c7450d32d3d5adaf5bf7e44f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 17:26:41 +0000 Subject: [PATCH 297/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6319 (#13130) - NuGet.Build.Tasks - 5.5.0-preview.1.6319 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54e51ef76bb7..4738f039fc81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,9 +55,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 + ba2a72ac9afd9e7260798a6ad14088297570b350 diff --git a/eng/Versions.props b/eng/Versions.props index b7f87abdc6a4..5dda11769f81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.4.0-rtm.6292 + 5.5.0-preview.1.6319 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 2cd94a5139abceb8079c94af9c04d97052a2b726 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 2 Dec 2019 09:46:12 -0800 Subject: [PATCH 298/896] Pin dependency on Microsoft.Netcore.App refpack to 3.1.0 (#3737) --- NuGet.config | 2 +- eng/Version.Details.xml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ee043f89379..a47e0b0b00a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78a247dc6469..6d592e1f1ded 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,10 +1,6 @@ - - https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 - https://github.com/dotnet/core-setup 4e1bb23ca12cfe3de0b7e834872ed7327377d420 @@ -74,6 +70,11 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + From 7b112c5a21cbd246e9e2e4de9cd50567b75f243a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 18:18:41 +0000 Subject: [PATCH 299/896] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#3753) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 ++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++ .../templates/post-build/common-variables.yml | 14 +- .../templates/post-build/post-build.yml | 80 ++++++++++- global.json | 2 +- 6 files changed, 330 insertions(+), 14 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67cf39b312e9..8958fd69137d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000000..2cb40c29474b --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000000..126452131710 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c1035c..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a923d..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index fe6dec5836e6..9462add2c278 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From ee2dc9d1a446ba70b39043443e1e99a659c8a9c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 18:37:47 +0000 Subject: [PATCH 300/896] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#13136) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++ eng/common/templates/job/execute-sdl.yml | 28 ++- ...al-30.yml => generic-internal-channel.yml} | 25 ++- ...ease-31.yml => generic-public-channel.yml} | 40 +++- .../channels/netcore-3-tools-validation.yml | 95 -------- .../post-build/channels/netcore-3-tools.yml | 130 ----------- .../post-build/channels/netcore-dev-31.yml | 130 ----------- .../post-build/channels/netcore-dev-5.yml | 130 ----------- .../channels/netcore-release-30.yml | 130 ----------- .../channels/netcore-tools-latest.yml | 130 ----------- .../channels/netcore-tools-validation.yml | 95 -------- .../templates/post-build/common-variables.yml | 26 ++- .../templates/post-build/post-build.yml | 209 +++++++++++++++++- global.json | 2 +- 16 files changed, 531 insertions(+), 887 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4738f039fc81..d325c539498f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000000..2cb40c29474b --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000000..126452131710 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419522..52e2ff021d70 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3571..68fdec029020 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7d4..c4bc1897d81f 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fcfc..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e750..000000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187d9..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb62..000000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29de..000000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9772..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af6f..000000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186c0..216d043e4e3b 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -11,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff183..9921743bcdb5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,244 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index cbaea0728342..9462add2c278 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 3adb78d1e8968c05c7aa5d60cc3566da5728d5b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 18:41:00 +0000 Subject: [PATCH 301/896] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#13132) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d658942d9363..74c47516de85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000000..2cb40c29474b --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000000..126452131710 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index 8d3423abde7f..9462add2c278 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 389568aeeece179d6ccf9ddd52397e464569a211 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 2 Dec 2019 10:58:07 -0800 Subject: [PATCH 302/896] Pin dependency on Microsoft.Netcore.App refpack to 3.1.0 (#13131) --- NuGet.config | 1 + eng/Version.Details.xml | 9 +++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 283ad6849da4..e228c2b748b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74c47516de85..4df7aaa421a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,10 +5,6 @@ https://github.com/dotnet/templating b275b18fd7014d67078e2477f693301ea04e6549 - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 - https://github.com/dotnet/core-setup 3175a035df26e4082ad5513be661400ce722d0f5 @@ -39,6 +35,11 @@ https://github.com/aspnet/AspNetCore c31f51e5c778dc817862d0c932e7cfe9223d4899 + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + diff --git a/eng/Versions.props b/eng/Versions.props index 867116e7dd4c..490a3ac7429b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.1-servicing.19576.7 + 3.1.0 3.1.1-servicing.19576.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 3.1.1-servicing.19576.7 From 9d547ab689fd3e54e16523a5acef317e98eb6aa7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2019 23:28:41 +0000 Subject: [PATCH 303/896] Update dependencies from https://github.com/dotnet/templating build 20191127.2 (#13134) - Microsoft.TemplateEngine.Cli - 3.1.1-servicing.19577.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4df7aaa421a5..a4b631f10495 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - b275b18fd7014d67078e2477f693301ea04e6549 + ea3020cd0422107d6f982b363aa16c59fe2e846e https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 490a3ac7429b..fea7decbc306 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-rtm.19570.2 + 3.1.1-servicing.19577.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 3ad10806927aa05982a33a32ac947506af53db47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2019 23:33:42 +0000 Subject: [PATCH 304/896] Update dependencies from https://github.com/aspnet/AspNetCore build 20191125.14 (#13124) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-rtm.19575.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4b631f10495..78dbdd76ecc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 diff --git a/eng/Versions.props b/eng/Versions.props index fea7decbc306..7b76cbd13b60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19573.3 + 3.1.0-rtm.19575.14 From ea2570ca5a1498cb23ffc06fa33f32dc5852e42b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:08:48 +0000 Subject: [PATCH 305/896] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#3769) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- NuGet.config | 1 + eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 5 files changed, 79 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index a47e0b0b00a7..ae7b562ef953 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d592e1f1ded..197f855829fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c29474b..f7867a56b8cf 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131710..4ebb1e5a4400 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index 9462add2c278..82825968b58a 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From 690b3ddc6e8d4596dc52a601024cdb9d6f9c3505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:10:13 +0000 Subject: [PATCH 306/896] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#3770) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 4 files changed, 78 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 037db093c305..1877a12d1d02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c29474b..f7867a56b8cf 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131710..4ebb1e5a4400 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index cd9847341a4f..ca1099a9ce2b 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From 4c3d4f1128fb92ecb3fa88aa36e6afb7a97f87dd Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 5 Dec 2019 11:11:30 -0800 Subject: [PATCH 307/896] Update branching to "preview" --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c0453ff01e60..70ee49e798a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3.1.200 - preview1 + preview From 1753f2f418a9c66322d4295d1af60e0f3cd0c47e Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 5 Dec 2019 11:12:26 -0800 Subject: [PATCH 308/896] Update branching to "preview" --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a9ffe7a2093..c86da8c509eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3.1.200 - preview1 + preview From 83f7c747bd808c0b80cef33a2d1967035ee49f7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:12:59 +0000 Subject: [PATCH 309/896] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#3768) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- NuGet.config | 1 + eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 5 files changed, 79 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index a47e0b0b00a7..ae7b562ef953 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d592e1f1ded..197f855829fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c29474b..f7867a56b8cf 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131710..4ebb1e5a4400 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index 9462add2c278..82825968b58a 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From dbe33a5d334171bf47c9745293f809c2667cbd97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:13:26 +0000 Subject: [PATCH 310/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6319 (#3735) - NuGet.Build.Tasks - 5.5.0-preview.1.6319 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 197f855829fe..c85f0479c772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/wpf 67636428e8671ea15833016b462691530225035c - + https://github.com/NuGet/NuGet.Client - 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 + ba2a72ac9afd9e7260798a6ad14088297570b350 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8a9ffe7a2093..406b5f7c7402 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.4.0-rtm.6292 + 5.5.0-preview.1.6319 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 1711fe95ee1e65a5f7b690f2d551cb4eaaefab7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:15:00 +0000 Subject: [PATCH 311/896] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore-Tooling (#3730) * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191126.6 - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19576.6 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191127.2 - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19577.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 197f855829fe..2d50a94443d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/roslyn 82f2e2541478e239dc4b04f231e90dc2b3dcb422 - + https://github.com/aspnet/AspNetCore-Tooling - 5a489a79189da32e5046c3eeda5f80c4e1258cb8 + 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 diff --git a/eng/Versions.props b/eng/Versions.props index 457ae94d94e1..7662bddf6abe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19575.9 + 3.1.1-servicing.19577.2 From 2c9568d3215aaa883d0752ca221318c7e415fd3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:16:34 +0000 Subject: [PATCH 312/896] Update dependencies from https://github.com/dotnet/core-setup build 20191126.08 (#3729) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-08 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1877a12d1d02..bd90c517fb43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ec8fae13cf75..095a37bef188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ 3.0.0 - 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-08 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From d786a8fdc27881145e3c9c3b736747c02c11292b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:18:18 +0000 Subject: [PATCH 313/896] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#13138) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 4 files changed, 78 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78dbdd76ecc2..30dccb6a53b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c29474b..f7867a56b8cf 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131710..4ebb1e5a4400 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index 9462add2c278..82825968b58a 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From a952d1e93b49087bb4a740305e744210552a0e19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:18:58 +0000 Subject: [PATCH 314/896] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#13139) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 4 files changed, 78 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ea618d0cfa9..2c51bd07ac29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c29474b..f7867a56b8cf 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131710..4ebb1e5a4400 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index 9462add2c278..82825968b58a 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From d3a2342fffd281676c6779153f76dee3a254201c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 21:12:45 +0000 Subject: [PATCH 315/896] [release/3.1.2xx] Update dependencies from dotnet/cli (#3755) * Update dependencies from https://github.com/dotnet/cli build 20191202.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview1.19602.1 * Update dependencies from https://github.com/dotnet/cli build 20191202.2 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview1.19602.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c85f0479c772..d96d696fdab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 4e1bb23ca12cfe3de0b7e834872ed7327377d420 - + https://github.com/dotnet/cli - 0e5712bd568bb17296171cf7f6bc31ecf414b0c0 + ee2dc9d1a446ba70b39043443e1e99a659c8a9c3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 406b5f7c7402..40977f674413 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19572.3 + 3.1.200-preview1.19602.2 From 2c77dea3bde103a79dd9f84b88f5d27ad5d57bf9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 5 Dec 2019 16:33:27 -0800 Subject: [PATCH 316/896] Update to 3.1.100 rtm sdk (#3777) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 82825968b58a..356b8b771772 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014076", + "dotnet": "3.1.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" From 906afcfac2796b2ba9df224ac63debfa51f4fb00 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 5 Dec 2019 16:33:51 -0800 Subject: [PATCH 317/896] Update to 3.1.100 rtm sdk (#3778) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 82825968b58a..356b8b771772 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014076", + "dotnet": "3.1.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" From 36efbd3fa996bef1e33114d6b4d8f028f19c0a6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 02:20:29 +0000 Subject: [PATCH 318/896] Update dependencies from https://github.com/dotnet/templating build 20191205.2 (#13145) - Microsoft.TemplateEngine.Cli - 3.1.1-servicing.19605.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30dccb6a53b4..0a696ecd5603 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - ea3020cd0422107d6f982b363aa16c59fe2e846e + 13abe7e2749d95337e8d72efdc5b71611815fd43 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 7b76cbd13b60..5745d84ad05a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.1-servicing.19577.2 + 3.1.1-servicing.19605.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 2777f79298918a86bf93f39e3f631f515b7adc7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 02:25:31 +0000 Subject: [PATCH 319/896] Update dependencies from https://github.com/dotnet/templating build 20191205.2 (#13146) - Microsoft.TemplateEngine.Cli - 3.1.1-servicing.19605.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c51bd07ac29..d99fbb32e7a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - b275b18fd7014d67078e2477f693301ea04e6549 + 13abe7e2749d95337e8d72efdc5b71611815fd43 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index c0453ff01e60..552c9a17faef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.0-rtm.19570.2 + 3.1.1-servicing.19605.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 51537ea79d845627602a85513d90c257f50035ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 19:45:38 +0000 Subject: [PATCH 320/896] [release/3.1.2xx] Update dependencies from dotnet/roslyn (#3779) * Update dependencies from https://github.com/dotnet/roslyn build 20191121.1 - Microsoft.NETCore.Compilers - 3.5.0-beta1-19571-01 * Update dependencies from https://github.com/dotnet/roslyn build 20191206.4 - Microsoft.NETCore.Compilers - 3.5.0-beta1-19606-04 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d96d696fdab1..3a5f464bf76c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/dotnet/fsharp e7597deb7042710a7142bdccabd6f92b0840d354 - + https://github.com/dotnet/roslyn - 82f2e2541478e239dc4b04f231e90dc2b3dcb422 + d2bd58c62f9104d66f415141a1a27b665c78690c https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index a2865ea420d0..724495d6e29f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.0-beta4-19569-03 + 3.5.0-beta1-19606-04 From e8a3de034241e88a72af140ba03cfa13653cf1dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:10:33 +0000 Subject: [PATCH 321/896] Update dependencies from https://github.com/dotnet/roslyn build 20191206.5 (#3788) - Microsoft.NETCore.Compilers - 3.4.0-beta4-19606-05 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d50a94443d2..ef2c30bff3e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/dotnet/fsharp e7597deb7042710a7142bdccabd6f92b0840d354 - + https://github.com/dotnet/roslyn - 82f2e2541478e239dc4b04f231e90dc2b3dcb422 + 0459b49816387fb87be113a40002c0c1f1b77b71 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 7662bddf6abe..995c920fb7fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.0-beta4-19569-03 + 3.4.0-beta4-19606-05 From 19fa47189eabd7794ffc3de7158f6737941f6289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2019 03:55:08 +0000 Subject: [PATCH 322/896] Update dependencies from https://github.com/dotnet/roslyn build 20191207.2 (#3790) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19607-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef2c30bff3e7..59cf70df5262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/dotnet/fsharp e7597deb7042710a7142bdccabd6f92b0840d354 - + https://github.com/dotnet/roslyn - 0459b49816387fb87be113a40002c0c1f1b77b71 + 52d275c4f82f329a9732b078c7f7fa0e45cd3e84 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 995c920fb7fd..812e60d5a5d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.0-beta4-19606-05 + 3.4.1-beta4-19607-02 From 41441f66cefa6fda958fb9b9bea90301a599b4ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2019 00:06:49 +0000 Subject: [PATCH 323/896] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#13150) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d99fbb32e7a0..27394c24ee6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b8cf..a8b5280d9ddd 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301a1..ec3e739fe836 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958af0..d259a274c780 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029020..ad9375f5e5c5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bcdb5..b121d77e07d1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405e5..92a053bd16b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea466..94965a8fd2a9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index 82825968b58a..422492817fc1 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From 7f96a5cdc9ee1bd46b514c2248951fc0a4af93aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2019 17:51:30 +0000 Subject: [PATCH 324/896] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#3796) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a5f464bf76c..9e1000302929 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b8cf..a8b5280d9ddd 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301a1..ec3e739fe836 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958af0..d259a274c780 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029020..ad9375f5e5c5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bcdb5..b121d77e07d1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405e5..92a053bd16b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea466..94965a8fd2a9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index 356b8b771772..0950f488b276 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From 4357e05c1d9411de0dd775ba115f79280c1d1913 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2019 17:51:58 +0000 Subject: [PATCH 325/896] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#3797) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59cf70df5262..7cded07b288c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b8cf..a8b5280d9ddd 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301a1..ec3e739fe836 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958af0..d259a274c780 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029020..ad9375f5e5c5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bcdb5..b121d77e07d1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405e5..92a053bd16b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea466..94965a8fd2a9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index 356b8b771772..0950f488b276 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From 40253f775c0e464dee93a3d3c77456c71504e0e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2019 17:52:26 +0000 Subject: [PATCH 326/896] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#3798) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd90c517fb43..26c502a519e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b8cf..a8b5280d9ddd 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301a1..ec3e739fe836 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958af0..d259a274c780 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029020..ad9375f5e5c5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bcdb5..b121d77e07d1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405e5..92a053bd16b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea466..94965a8fd2a9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index ca1099a9ce2b..8563be377485 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From 5cc0248742df89b2434fdba86ea9a162e630eb25 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 8 Dec 2019 16:00:43 -0800 Subject: [PATCH 327/896] Update stage0 --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index daf8d1cc1428..1a1bdd45f6bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-preview1-014076 + 3.1.200-preview-014770 diff --git a/global.json b/global.json index 422492817fc1..818cfc51016e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014076", + "dotnet": "3.1.200-preview-014770", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" From 50410271358b32891ffffbc27c99dd9385c478ba Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 5 Dec 2019 14:24:16 -0800 Subject: [PATCH 328/896] Update to matching msbuild version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1a1bdd45f6bc..0fb4fc5b8b8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 16.3.0 + 16.4.0 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From ca9c7c37283e6f83cd0ed8ecf485093363a0e516 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 05:23:17 +0000 Subject: [PATCH 329/896] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#13148) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a696ecd5603..3ea9ff37818c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b8cf..a8b5280d9ddd 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301a1..ec3e739fe836 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958af0..d259a274c780 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029020..ad9375f5e5c5 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bcdb5..b121d77e07d1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405e5..92a053bd16b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea466..94965a8fd2a9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index 82825968b58a..422492817fc1 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From b3a9c2eeb30c3c95e0481c60115714df4fef2f5d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Dec 2019 10:21:55 -0800 Subject: [PATCH 330/896] [release/3.1.1xx] Update to 3.1.100 rtm sdk (#13143) * Update to 3.1.100 rtm sdk * Update LKG version * Update to matching msbuild version * Add nuget.org as feed --- eng/Versions.props | 4 ++-- global.json | 2 +- test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5745d84ad05a..aa1d402c6600 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.100-preview1-014076 + 3.1.100 @@ -31,7 +31,7 @@ - 16.3.0 + 16.4.0 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) diff --git a/global.json b/global.json index 422492817fc1..0950f488b276 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014076", + "dotnet": "3.1.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" diff --git a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs index 4ec66447714e..622ae6b083af 100644 --- a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs +++ b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs @@ -120,6 +120,7 @@ public TestAssetInstance WithNuGetConfig(string nugetCache, string externalResto + $externalRestoreSources$ From 47476fd1a183857efaa0bc3ab8a79ddc79219bc7 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 8 Dec 2019 18:08:24 -0800 Subject: [PATCH 331/896] Add nuget.org as feed --- test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs index 4ec66447714e..622ae6b083af 100644 --- a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs +++ b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs @@ -120,6 +120,7 @@ public TestAssetInstance WithNuGetConfig(string nugetCache, string externalResto + $externalRestoreSources$ From d7d52fb590a596eb7b86a5f15d3880f70e514f89 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Dec 2019 10:51:04 -0800 Subject: [PATCH 332/896] Fixup --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 15a4b967c8dd..0950f488b276 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { - "tools": {https://github.com/dotnet/toolset/pull/3800 + "tools": { "dotnet": "3.1.100", "runtimes": { "dotnet": [ From 43d519abb5cf0182067d65bf3aeb6b2be83a6caa Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Dec 2019 10:59:22 -0800 Subject: [PATCH 333/896] Switch to Microsoft.NETCoreApp.Internal package version for runtime download (#3800) Also move pinned dependency to end to avoid potential CPD issue --- eng/Version.Details.xml | 12 ++++++++---- eng/Versions.props | 1 + global.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26c502a519e7..285a70286fd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,10 +1,6 @@ - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - https://github.com/dotnet/core-setup 547ae1f5f072d130b32ec3089876711070b2dc4f @@ -70,6 +66,14 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + + https://github.com/dotnet/core-setup + 547ae1f5f072d130b32ec3089876711070b2dc4f + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + diff --git a/eng/Versions.props b/eng/Versions.props index 095a37bef188..e951c9dca8c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,6 +77,7 @@ 3.0.0 + 3.0.2-servicing-19576-08 3.0.2-servicing-19576-08 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) diff --git a/global.json b/global.json index 8563be377485..4d10d2324feb 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "3.0.101", "runtimes": { "dotnet": [ - "$(MicrosoftNETCoreAppRuntimePackageVersion)" + "$(MicrosoftNETCoreAppInternalPackageVersion)" ] } }, From ad6f8e62b414e91298e3c2c594e27e6e64778797 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 9 Dec 2019 19:37:11 +0000 Subject: [PATCH 334/896] Merge pull request 4705 from darc-internal/release/3.1.1xx-c6dc3300-8106-40a2-b807-f5cde60ca533 into internal/release/3.1.1xx --- .vsts-ci.yml | 16 ++++++------- NuGet.config | 1 + eng/Version.Details.xml | 52 +++++++++++++++++++++++------------------ eng/Versions.props | 11 +++++---- eng/build.yml | 32 +++++++++++++++++++++---- global.json | 2 +- 6 files changed, 72 insertions(+), 42 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0cae6999272e..ad7bfe549062 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -9,29 +9,27 @@ variables: - name: _DotNetArtifactsCategory value: .NETCore - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - name: PB_PublishBlobFeedKey - value: - - name: PB_PublishBlobFeedUrl - value: - name: _DotNetPublishToBlobFeed value: false - name: _PublishUsingPipelines value: false - - name: _PublishType - value: none - name: _SignType value: test + - name: _InternalRuntimeDownloadArgs + value: '' - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - name: PB_PublishBlobFeedUrl + - name: _DotNetPublishToBlobUrl value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - name: _DotNetPublishToBlobFeed value: true - name: _PublishUsingPipelines value: true - - name: _PublishType - value: blob - name: _SignType value: real + - group: DotNet-MSRC-Storage + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-CLI-SDLValidation-Params diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..6918fa4408c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ea9ff37818c..402ea8e5edd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,25 +5,25 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e @@ -40,14 +40,6 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - - - - https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 - - - https://github.com/dotnet/sdk 49bbede419cf63e15c70f4b463f80e4811fe3f34 @@ -60,5 +52,19 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + + https://github.com/dotnet/arcade + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + + diff --git a/eng/Versions.props b/eng/Versions.props index 5745d84ad05a..10d3d9219c19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,13 @@ 3.1.0 - 3.1.1-servicing.19576.7 + 3.1.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 + 3.1.1-servicing.19608.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 diff --git a/eng/build.yml b/eng/build.yml index 4b9696a193aa..c303b0701abf 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -47,17 +47,24 @@ jobs: - group: DotNet-Blob-Feed - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _PublishArgs: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) - /p:DotNetPublishBlobFeedUrl=$(PB_PublishBlobFeedUrl) + /p:DotNetPublishBlobFeedUrl=$(_DotNetPublishToBlobUrl) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PB_PublishType=$(_PublishType) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) steps: - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: build.cmd -test -sign -pack -publish -ci -Configuration $(BuildConfig) @@ -65,14 +72,21 @@ jobs: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) DropSuffix: $(_DropSuffix) - BlobFeedUrl: $(PB_PublishBlobFeedUrl) - PublishType: $(_PublishType) - ${{ if eq(parameters.agentOs, 'Linux') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.sh --test --pack --publish --ci --configuration $(BuildConfig) @@ -80,14 +94,24 @@ jobs: --architecture $(BuildArchitecture) $(LinuxPortable) $(RuntimeId) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DropSuffix: $(_DropSuffix) - ${{ if eq(parameters.agentOs, 'Darwin') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.sh --test --pack --publish --ci --configuration $(BuildConfig) + $(_InternalRuntimeDownloadArgs) displayName: Build - ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/global.json b/global.json index 422492817fc1..495e5b026955 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "3.1.100-preview1-014076", "runtimes": { "dotnet": [ - "$(MicrosoftNETCoreAppRuntimePackageVersion)" + "$(MicrosoftNETCoreAppInternalPackageVersion)" ] } }, From a76fba9ebd6982a8d3136d6b3359c5e5b3ab5984 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 10 Dec 2019 08:25:43 -0800 Subject: [PATCH 335/896] [release/3.0.1xx] Switch to new variable syntax (#3799) * Switch to new variable syntax * Update branches to build --- .vsts-ci.yml | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index fdff8ec2bfa9..4bfdb0d647a1 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,21 +1,33 @@ trigger: - master - release/* +- internal/release/3.* variables: - _TeamName: Roslyn-Project-System - _DotNetArtifactsCategory: Toolset - ${{ if eq(variables['System.TeamProject'], 'public') }}: - PB_PublishBlobFeedKey: - PB_PublishBlobFeedUrl: - _DotNetPublishToBlobFeed: false - _PublishUsingPipelines: false - _PublishType: none - ${{ if ne(variables['System.TeamProject'], 'public') }}: - PB_PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json - _DotNetPublishToBlobFeed: true - _PublishUsingPipelines: true - _PublishType: blob + - name: _TeamName + value: Roslyn-Project-System + - name: _DotNetArtifactsCategory + value: Toolset + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + - name: PB_PublishBlobFeedKey + value: '' + - name: PB_PublishBlobFeedUrl + value: '' + - name: _DotNetPublishToBlobFeed + value: false + - name: _PublishUsingPipelines + value: false + - name: _PublishType + value: none + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: PB_PublishBlobFeedUrl + value: https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json + - name: _DotNetPublishToBlobFeed + value: true + - name: _PublishUsingPipelines + value: true + - name: _PublishType + value: blob stages: - stage: build @@ -27,7 +39,7 @@ stages: name: Hosted VS2017 strategy: matrix: - ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: Build_Debug_x86: _BuildConfig: Debug _BuildArchitecture: x86 @@ -35,7 +47,7 @@ stages: _BuildConfig: Release _BuildArchitecture: x64 - - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/build.yml parameters: agentOs: Linux From b72a1540cf2bc6fd79023d675b277f6124bdcaaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 10 Dec 2019 21:48:04 +0000 Subject: [PATCH 336/896] Merge pull request 4757 from darc-internal/release/3.1.1xx-eec52228-a0de-416b-943d-8a68e51bfbab into internal/release/3.1.1xx --- .vsts-ci.yml | 8 ++++++++ NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++++------ eng/Versions.props | 5 +++-- eng/build.yml | 28 +++++++++++++++++++++++++++- global.json | 2 +- 6 files changed, 50 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a48287e2c7f5..3968c48a95ab 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -30,6 +30,14 @@ variables: value: blob - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-CLI-SDLValidation-Params + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: DotNet-MSRC-Storage + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: _InternalRuntimeDownloadArgs + value: '' stages: - stage: build diff --git a/NuGet.config b/NuGet.config index ae7b562ef953..3fb7e18c8276 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,8 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cded07b288c..affa83569a84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - - https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e https://github.com/dotnet/cli @@ -34,9 +34,9 @@ 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 - - https://github.com/dotnet/wpf - 67636428e8671ea15833016b462691530225035c + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a8e48616c8d8e56469a456eb1ee263268316b827 https://github.com/NuGet/NuGet.Client @@ -75,6 +75,10 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e + diff --git a/eng/Versions.props b/eng/Versions.props index 812e60d5a5d6..ef07555687ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19570.2 + 3.1.0-rtm.19605.7 @@ -78,7 +78,8 @@ 3.1.0 - 3.1.0 + 3.1.1-servicing.19608.4 + 3.1.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) diff --git a/eng/build.yml b/eng/build.yml index fe0dc13b9f39..6bd1fd93ad4e 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -54,19 +54,35 @@ jobs: /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) - /p:PB_PublishType=$(_PublishType) steps: - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: build.cmd -pack -publish -ci -test -Configuration $(BuildConfig) -Architecture $(BuildArchitecture) $(_PublishArgs) $(_OfficialBuildIdArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build - ${{ if eq(parameters.agentOs, 'Linux') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.sh --pack --publish --ci --test --configuration $(BuildConfig) @@ -74,12 +90,22 @@ jobs: --architecture $(BuildArchitecture) $(LinuxPortable) $(RuntimeId) + $(_InternalRuntimeDownloadArgs) displayName: Build - ${{ if eq(parameters.agentOs, 'Darwin') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.sh --pack --publish --ci --test --configuration $(BuildConfig) + $(_InternalRuntimeDownloadArgs) displayName: Build - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/global.json b/global.json index 0950f488b276..6749add3fbde 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "3.1.100", "runtimes": { "dotnet": [ - "$(MicrosoftNETCoreAppRuntimePackageVersion)" + "$(MicrosoftNETCoreAppInternalPackageVersion)" ] } }, From ed8250ed792d0946a63eb017ae31fb740525423d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 10 Dec 2019 22:30:51 +0000 Subject: [PATCH 337/896] Merge pull request 4776 from darc-internal/release/3.1.1xx-ed96bf60-6c9d-4492-b315-553bf9a83abe into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index affa83569a84..81e304ba4db6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/roslyn 52d275c4f82f329a9732b078c7f7fa0e45cd3e84 - - https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 52c109089d78ef10b25d98e3876988bbc4e748a4 diff --git a/eng/Versions.props b/eng/Versions.props index ef07555687ea..d08280b3614d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19577.2 + 3.1.1-servicing.19610.6 From 27746b520df2eb1b4634a3ae0dfb7024e06eb19b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 10 Dec 2019 23:41:45 +0000 Subject: [PATCH 338/896] Merge pull request 4780 from darc-internal/release/3.1.1xx-d7a73a6b-ccaa-4632-85a2-fb22df0f247a into internal/release/3.1.1xx --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81e304ba4db6..2b2edd6e443a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/roslyn 52d275c4f82f329a9732b078c7f7fa0e45cd3e84 - + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 52c109089d78ef10b25d98e3876988bbc4e748a4 + 4dc05cadf50118f85153dc338f750e2d9a5b2550 diff --git a/eng/Versions.props b/eng/Versions.props index d08280b3614d..ee1559c69ee0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19610.6 + 3.1.1-servicing.19610.8 From ff3f8e13d70147da8a2fb0ecc671c7a9cb9c21ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2019 00:10:34 +0000 Subject: [PATCH 339/896] Update dependencies from https://github.com/dotnet/fsharp build 20191210.2 (#3810) - Microsoft.FSharp.Compiler - 10.8.0-beta.19610.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa52ffd5bd1a..2bd85799822b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - e7597deb7042710a7142bdccabd6f92b0840d354 + 94da88c64e7b10e23d265b225f8c04a6ea428071 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ba6b8cfbed77..e9b8259eb0ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.7.0-beta.19556.5 + 10.8.0-beta.19610.2 From 532be540a1c12a4ca55ddab6dca865d872951e8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2019 03:35:22 +0000 Subject: [PATCH 340/896] Update dependencies from https://github.com/dotnet/fsharp build 20191210.6 (#3814) - Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cded07b288c..f1c029bfd7cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - e7597deb7042710a7142bdccabd6f92b0840d354 + dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 812e60d5a5d6..5d0772f1791e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.7.0-beta.19556.5 + 10.7.0-beta.19610.6 From 568c0c8e3537a29590ad126f71c00d27fb96080b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 11 Dec 2019 07:00:11 -0800 Subject: [PATCH 341/896] Revert back to 3.1.0 runtime versions (#13155) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5da651080ecb..42fb06f9d4b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,25 +5,25 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 3175a035df26e4082ad5513be661400ce722d0f5 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 diff --git a/eng/Versions.props b/eng/Versions.props index 330057798b6a..c0977f8fb871 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,12 +18,12 @@ 3.1.0 - 3.1.1-servicing.19576.7 + 3.1.0 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 - 3.1.1-servicing.19576.7 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 From 2b70521a186009f156328499a87e4fa394c94efc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 11 Dec 2019 07:00:28 -0800 Subject: [PATCH 342/896] Revert back to 3.1.0 runtime versions (#3813) --- NuGet.config | 1 - eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae7b562ef953..a47e0b0b00a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bd85799822b..2cc04ab78224 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,7 +3,7 @@ https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/cli @@ -34,9 +34,9 @@ 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 - + https://github.com/dotnet/wpf - 67636428e8671ea15833016b462691530225035c + 427fa56aed34cbbc5096aa6137e748054905507d https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index e9b8259eb0ca..b15ac5fbf06d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19570.2 + 3.1.0-rtm.19565.1 From 27fa0b2c9fb756dc533a90f161a6df49f3a76a0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:02:18 +0000 Subject: [PATCH 343/896] Update dependencies from https://github.com/dotnet/roslyn build 20191210.2 (#3812) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19610-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c029bfd7cd..6e040cdb7c17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/dotnet/fsharp dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e - + https://github.com/dotnet/roslyn - 52d275c4f82f329a9732b078c7f7fa0e45cd3e84 + c4e5d138903b899477649a17f197abd2bcb22f9e https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 5d0772f1791e..25311b754a6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.1-beta4-19607-02 + 3.4.1-beta4-19610-02 From 99690073194007414876a661abb95b4b8e2cfd5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:15:41 +0000 Subject: [PATCH 344/896] [release/3.1.2xx] Update dependencies from dotnet/cli (#3815) * Update dependencies from https://github.com/dotnet/cli build 20191210.6 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19610.6 * Update dependencies from https://github.com/dotnet/cli build 20191211.2 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19611.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cc04ab78224..df1b5be389a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - ee2dc9d1a446ba70b39043443e1e99a659c8a9c3 + 568c0c8e3537a29590ad126f71c00d27fb96080b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b15ac5fbf06d..1dd572815fd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview1.19602.2 + 3.1.200-preview.19611.2 From 983c553c92b5b1888f0ebe321215b62d6c0f6af8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 11 Dec 2019 20:40:17 +0000 Subject: [PATCH 345/896] Merge pull request 4804 from darc-internal/release/3.1.1xx-5bf4157f-0394-4df4-967b-2245b48aec4d into internal/release/3.1.1xx --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3fb7e18c8276..24d4d9e06c5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3cc11dccf0a..7bfd57afc354 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn c4e5d138903b899477649a17f197abd2bcb22f9e - + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 4dc05cadf50118f85153dc338f750e2d9a5b2550 + 23d7fbbfaeedbf4def94e2baf33138a6c03dcac5 diff --git a/eng/Versions.props b/eng/Versions.props index c7053a9205a6..936a538c325d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19610.8 + 3.1.1 From e092819c99f61d5cbeb9febecbf57af154a6e276 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 11 Dec 2019 20:49:00 +0000 Subject: [PATCH 346/896] Merge pull request 4797 from darc-internal/release/3.1.1xx-ded4a926-e893-4e17-83ef-6b944a71ee18 into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bfd57afc354..0146cea8f495 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/cli - 0e5712bd568bb17296171cf7f6bc31ecf414b0c0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-cli + 5280f052b738e730d5f532a607f7a0927f0e17c2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 936a538c325d..eced9e9cd8b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19572.3 + 3.1.101-servicing.19611.5 From 6b877349d0c963e0abea59d6b3a56b39ba84e6b0 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 11 Dec 2019 12:11:42 -0800 Subject: [PATCH 347/896] Revert MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion to match ref pack --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5da651080ecb..cf1bf60f2727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + 2b7e994b8a304700a09617ffc5052f0d943bbcba diff --git a/eng/Versions.props b/eng/Versions.props index febe1aa1b787..ae8698f0356d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19575.14 + 3.1.0-rtm.19566.1 From b81f1d1eb9d0d60e1975b3f57522fe142aeba40f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 11 Dec 2019 15:51:56 -0800 Subject: [PATCH 348/896] Use microsoft.net.compilers.toolset package (#3808) microsoft.netcore.compilers will no longer be produced --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- src/redist/redist.csproj | 2 +- src/redist/targets/GenerateLayout.targets | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df1b5be389a0..e89601ab0b08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,7 +25,7 @@ https://github.com/dotnet/fsharp 94da88c64e7b10e23d265b225f8c04a6ea428071 - + https://github.com/dotnet/roslyn d2bd58c62f9104d66f415141a1a27b665c78690c diff --git a/eng/Versions.props b/eng/Versions.props index 1dd572815fd2..579bbb7fc746 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta1-19606-04 + 3.5.0-beta1-19606-04 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 8fd563764175..65d378c9457f 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 376bb9eebe9a..a57c64402ee2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -13,8 +13,9 @@ $(OutputPath)/Roslyn - + + From 1cb2a6b0555546fafb826dd9a460ae745aebbdf7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 Dec 2019 00:25:15 +0000 Subject: [PATCH 349/896] Merge pull request 4823 from darc-internal/release/3.1.1xx-febd6690-ac84-4400-97d9-4ceb35f19420 into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24d4d9e06c5d..8b91fae6b4a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0146cea8f495..f1a3ff4c9381 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 23d7fbbfaeedbf4def94e2baf33138a6c03dcac5 + 07f205535e6fb23ca8f553827fa26e684be6b8ce From 5b56064b6459a796f4f16e23b5392c7b71314a1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2019 00:46:09 +0000 Subject: [PATCH 350/896] Update dependencies from https://github.com/dotnet/cli build 20191211.9 (#3820) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19611.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e89601ab0b08..18a013382280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 568c0c8e3537a29590ad126f71c00d27fb96080b + 97c36cec62f49a6f2c970f7b5fa74ed3b457df56 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 579bbb7fc746..7e8acfd7581a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19611.2 + 3.1.200-preview.19611.9 From c2984bc9fbf94066784cd80dc6c6a7a91ae9acc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2019 03:10:19 +0000 Subject: [PATCH 351/896] Update dependencies from https://github.com/dotnet/fsharp build 20191211.4 (#3822) - Microsoft.FSharp.Compiler - 10.8.0-beta.19611.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18a013382280..f7806032b99b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 94da88c64e7b10e23d265b225f8c04a6ea428071 + 695d772382d282e3f39d1138fdeca2cc7c974670 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7e8acfd7581a..72db7286af47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19610.2 + 10.8.0-beta.19611.4 From 05b52ca8f33a5252d49ff44644f766ec8300e701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2019 22:10:22 +0000 Subject: [PATCH 352/896] Update dependencies from https://github.com/dotnet/fsharp build 20191212.4 (#3832) - Microsoft.FSharp.Compiler - 10.8.0-beta.19612.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7806032b99b..d5b78ebb9b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 695d772382d282e3f39d1138fdeca2cc7c974670 + 857287075a2d5d04d3ba603d61258fef8118dff4 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 72db7286af47..c3bf4057226b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19611.4 + 10.8.0-beta.19612.4 From 30423cac34cfde2a76fb79c272fdab3af2da7771 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 13 Dec 2019 00:15:16 +0000 Subject: [PATCH 353/896] Merge pull request 4854 from darc-internal/release/3.1.1xx-ba28be59-851c-415d-b175-2ca34aa3e42c into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b91fae6b4a9..0b4a5933f3b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1a3ff4c9381..ced462d32372 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f205535e6fb23ca8f553827fa26e684be6b8ce + 5cf918f08ac1775bee5d6814b7475b1f62185839 From 824864bdc9b3419ce670429210f031656c05fcc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 15:35:16 +0000 Subject: [PATCH 354/896] Update dependencies from https://github.com/dotnet/core-setup build 20191208.1 (#3838) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1 Dependency coherency updates - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19608.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19577.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae7b562ef953..50eb2940edae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ba06e6ec172..413886f6611f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 48818b3e5c5e196cfe2dd2c9642c1667e4a22254 - + https://github.com/dotnet/core-setup - 4e1bb23ca12cfe3de0b7e834872ed7327377d420 + 48818b3e5c5e196cfe2dd2c9642c1667e4a22254 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 - + https://github.com/dotnet/wpf - 67636428e8671ea15833016b462691530225035c + 774b5e2d2b827743fa425612acc4988f9f350c6e https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 924123e462b6..fedbc68f7247 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19570.2 + 3.1.0-rtm.19577.4 @@ -78,8 +78,8 @@ 3.1.0 - 3.1.0-rtm.19571.5 - 3.1.0 + 3.1.1-servicing.19608.1 + 3.1.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 8119e11cdadf8c957820760d23734fc3e687e107 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 21:42:01 +0000 Subject: [PATCH 355/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#3831) * Update dependencies from https://github.com/dotnet/sdk build 20191212.14 - Microsoft.NET.Sdk - 3.1.200-preview.19612.14 * Update dependencies from https://github.com/dotnet/sdk build 20191213.2 - Microsoft.NET.Sdk - 3.1.200-preview.19613.2 * Update dependencies from https://github.com/dotnet/sdk build 20191213.8 - Microsoft.NET.Sdk - 3.1.200-preview.19613.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5b78ebb9b9c..9d56ec49b3be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli 97c36cec62f49a6f2c970f7b5fa74ed3b457df56 - + https://github.com/dotnet/sdk - 49bbede419cf63e15c70f4b463f80e4811fe3f34 + e98d59e0cc80d22c6c56e5818cd62583973b6657 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c3bf4057226b..44a271ca77b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.100-rtm.19568.4 + 3.1.200-preview.19613.8 From af3dd928e89be55ef417b0b01b3f693767bce131 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 22:07:35 +0000 Subject: [PATCH 356/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#13158) * Update dependencies from https://github.com/dotnet/sdk build 20191212.14 - Microsoft.NET.Sdk - 3.1.200-preview.19612.14 * Update dependencies from https://github.com/dotnet/sdk build 20191213.2 - Microsoft.NET.Sdk - 3.1.200-preview.19613.2 * Update dependencies from https://github.com/dotnet/sdk build 20191213.8 - Microsoft.NET.Sdk - 3.1.200-preview.19613.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8411932c3663..95333fc4431d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 49bbede419cf63e15c70f4b463f80e4811fe3f34 + e98d59e0cc80d22c6c56e5818cd62583973b6657 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 419f0a1fec47..56cccbd64e78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.100-rtm.19568.4 + 3.1.200-preview.19613.8 $(MicrosoftNETSdkPackageVersion) From 8058f6208f5aebe20aa218d5716199ca581cdd0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 22:45:23 +0000 Subject: [PATCH 357/896] Update dependencies from https://github.com/dotnet/cli build 20191213.1 (#3840) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19613.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d56ec49b3be..88574248b4b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 97c36cec62f49a6f2c970f7b5fa74ed3b457df56 + 14b31af283537f1f39885f27db6e10ee85bebc84 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 44a271ca77b0..6fd3bb6fb621 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19611.9 + 3.1.200-preview.19613.1 From bd67977ea429e97a6b4c51373920dc92bb348110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 23:00:20 +0000 Subject: [PATCH 358/896] Update dependencies from https://github.com/dotnet/cli build 20191213.4 (#3841) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19613.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88574248b4b1..755d6909500b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 14b31af283537f1f39885f27db6e10ee85bebc84 + af3dd928e89be55ef417b0b01b3f693767bce131 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6fd3bb6fb621..834594f12c87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19613.1 + 3.1.200-preview.19613.4 From 9524b10a6f35bcd2ab60aaac88caa2fa83084750 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2019 00:50:19 +0000 Subject: [PATCH 359/896] Update dependencies from https://github.com/dotnet/sdk build 20191213.18 (#3843) - Microsoft.NET.Sdk - 3.1.200-preview.19613.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 755d6909500b..68e6eb2aa2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli af3dd928e89be55ef417b0b01b3f693767bce131 - + https://github.com/dotnet/sdk - e98d59e0cc80d22c6c56e5818cd62583973b6657 + 27111f9d39aae0d41c0958b5f1445145bb05f994 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 834594f12c87..37cb5a35cd9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19613.8 + 3.1.200-preview.19613.18 From 2a75f96fa191939dd2793f82b1ee07236f39127e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2019 02:54:09 +0000 Subject: [PATCH 360/896] Update dependencies from https://github.com/dotnet/roslyn build 20191214.1 (#3844) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 413886f6611f..61def91300fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e - + https://github.com/dotnet/roslyn - c4e5d138903b899477649a17f197abd2bcb22f9e + 165046097562cfe65b09c2e9a9d8f7cd88526f2c https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index fedbc68f7247..c12287a8a741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.4.1-beta4-19610-02 + 3.4.1-beta4-19614-01 From 8b2b3edde80fd305b05854638176ae16a158217e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 14 Dec 2019 20:30:15 +0000 Subject: [PATCH 361/896] Merge pull request 4894 from darc-internal/release/3.1.1xx-4e27e2c9-6b48-469a-8653-aaaec42a3a23 into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b4a5933f3b6..e3c840ab9272 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea701ea5c02..4c63450ed6be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 5cf918f08ac1775bee5d6814b7475b1f62185839 + a2c28cd8ea104abafd6d740869d61d0445eed1c5 From 3e8fe138f9d0de881c63c156542c83449dd6810d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 15 Dec 2019 00:45:14 +0000 Subject: [PATCH 362/896] Merge pull request 4897 from darc-internal/release/3.1.1xx-ff1c84ce-c9b2-4dea-82fa-22cc930bb013 into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 402ea8e5edd9..4a17739ef8c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + f53765fb4508a0d37d7b255c10751a8bb960201e diff --git a/eng/Versions.props b/eng/Versions.props index 678b67e11e87..0ebd4ad7cd9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.0-rtm.19575.14 + 3.1.1-servicing.19614.10 From 13576977b2fe010a917dbee0c41b0a7345bb920a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 15 Dec 2019 02:05:17 +0000 Subject: [PATCH 363/896] Merge pull request 4900 from darc-internal/release/3.1.1xx-6a196a57-4d5f-47cc-af1b-8835b3cce910 into internal/release/3.1.1xx --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c63450ed6be..0504ae542084 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 5280f052b738e730d5f532a607f7a0927f0e17c2 + 3e8fe138f9d0de881c63c156542c83449dd6810d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9ae94a4957be..ccdf84fb206d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19611.5 + 3.1.101-servicing.19614.2 From 6c3b3f32b1296e34ccf8ad3c70938627e7988a38 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 15 Dec 2019 03:25:15 +0000 Subject: [PATCH 364/896] Merge pull request 4902 from darc-internal/release/3.1.1xx-324c0ced-2288-436d-a166-1ca653585f2a into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3c840ab9272..93ae591f817a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0504ae542084..2105903ddef2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - a2c28cd8ea104abafd6d740869d61d0445eed1c5 + 07f16c89db55ab6f9f773cc3db6eb5a52908065e From 4805586dccc2f93304dfb164fc46bad0291de0f1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 Dec 2019 05:32:32 +0000 Subject: [PATCH 365/896] Merge pull request 4795 from darc-internal/release/3.1.1xx-3c131249-843e-4f71-852b-174b97f22b07 into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2105903ddef2..23b09bb371d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - - https://github.com/aspnet/websdk - 72a4eb78f1aa8af48f6fd7441fccea38639d9d6d + + https://dev.azure.com/dnceng/internal/_git/aspnet-websdk + 46384b58c9ac343724935fb0c62a10794d6cab85 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index ccdf84fb206d..f47df4104d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19575.2 + 3.1.101-servicing.19615.7 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 6fabbc4f9c1e5c63a6c452b2168f67073e1d91e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 07:05:20 +0000 Subject: [PATCH 366/896] Update dependencies from https://github.com/dotnet/fsharp build 20191215.6 (#3856) - Microsoft.FSharp.Compiler - 10.8.0-beta.19615.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68e6eb2aa2e6..b66728e213fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 857287075a2d5d04d3ba603d61258fef8118dff4 + 71ee93c393122279df28cf16011c615950205259 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 37cb5a35cd9e..62a04bb34af8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19612.4 + 10.8.0-beta.19615.6 From 2b25bd5b14de69a227490ed0e44b4475672d3ebe Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 Dec 2019 08:45:12 +0000 Subject: [PATCH 367/896] Merge pull request 4927 from darc-internal/release/3.1.1xx-f7a93401-3288-449e-bf89-05d2b79fa658 into internal/release/3.1.1xx --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a17739ef8c7..c602c881241e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - f53765fb4508a0d37d7b255c10751a8bb960201e + e276c8174b8bfdeb70efceafa81c75f8badbc8db diff --git a/eng/Versions.props b/eng/Versions.props index 0ebd4ad7cd9d..445bd3c39dd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.1-servicing.19614.10 + 3.1.1-servicing.19615.10 From 024daf9040f1e2eeafb8f6d2f2481a3f1a30b3c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 Dec 2019 09:15:16 +0000 Subject: [PATCH 368/896] Merge pull request 4928 from darc-internal/release/3.1.1xx-90e106b5-1dff-422a-bc85-4c4623e17fa3 into internal/release/3.1.1xx --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23b09bb371d3..267d72bd6d38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://dev.azure.com/dnceng/internal/_git/aspnet-websdk - 46384b58c9ac343724935fb0c62a10794d6cab85 + 4774c8edf507ac3f3ad0afff5046d12fede56cc7 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index f47df4104d1a..1daf92a377e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.101-servicing.19615.7 + 3.1.101-servicing.19616.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From f0d84405ad02c6cdd4824ec54c293b3f8394c474 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 Dec 2019 09:30:17 +0000 Subject: [PATCH 369/896] Merge pull request 4929 from darc-internal/release/3.1.1xx-04ccfb67-6f40-4b1e-ac0b-e83bf3bbaf35 into internal/release/3.1.1xx --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 267d72bd6d38..f1b6f6321bfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 3e8fe138f9d0de881c63c156542c83449dd6810d + 2b25bd5b14de69a227490ed0e44b4475672d3ebe https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1daf92a377e0..0ff13167ca9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19614.2 + 3.1.101-servicing.19616.2 From bf3ad1a659eda007cad466ae91f310634cc9c0d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 11:35:49 -0800 Subject: [PATCH 370/896] Update dependencies from https://github.com/dotnet/cli build 20191216.3 (#3861) - Microsoft.DotNet.Cli.Runtime - 3.1.101-servicing.19616.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61def91300fa..94737287481f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 48818b3e5c5e196cfe2dd2c9642c1667e4a22254 - + https://github.com/dotnet/cli - 0e5712bd568bb17296171cf7f6bc31ecf414b0c0 + 66ea81be3847f997988a19ad59c3304856c6fc8a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c12287a8a741..d5823bc411ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19572.3 + 3.1.101-servicing.19616.3 From abae56b103972d0a4b0d9d05e80c980807f247b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 04:55:19 +0000 Subject: [PATCH 371/896] Update dependencies from https://github.com/dotnet/fsharp build 20191216.27 (#3863) - Microsoft.FSharp.Compiler - 10.8.0-beta.19616.27 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b66728e213fa..8aedb007fbeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 71ee93c393122279df28cf16011c615950205259 + de637a9f6087a46cd45edda7aa1f461d88160d1a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 62a04bb34af8..252b9a73ddbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19615.6 + 10.8.0-beta.19616.27 From da12161d1d2c37d23639fa054852813615b10e07 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 Dec 2019 00:25:53 +0000 Subject: [PATCH 372/896] Merge pull request 4796 from darc-internal/release/3.1.1xx-22678dfd-ea0c-4035-805c-eb89698977df into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b6f6321bfd..3a7086af6d3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-cli 2b25bd5b14de69a227490ed0e44b4475672d3ebe - - https://github.com/dotnet/sdk - 49bbede419cf63e15c70f4b463f80e4811fe3f34 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 0ff13167ca9e..52fe739c1038 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.100-rtm.19568.4 + 3.1.101-servicing.19617.12 From 91705c83e44dd9221c3071e1bb7a87ba2f47688c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 Dec 2019 00:35:00 +0000 Subject: [PATCH 373/896] Merge pull request 4799 from darc-internal/release/3.1.1xx-bedc9299-4a08-48ca-b554-89f2b81eaf57 into internal/release/3.1.1xx --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c602c881241e..1170d63d3347 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - - https://github.com/dotnet/sdk - 49bbede419cf63e15c70f4b463f80e4811fe3f34 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 445bd3c39dd2..a68c601aae99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.100-rtm.19568.4 + 3.1.101-servicing.19617.12 $(MicrosoftNETSdkPackageVersion) From cdabc702600747a0789d395be25bebc76e3da1bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 01:05:18 +0000 Subject: [PATCH 374/896] Update dependencies from https://github.com/dotnet/sdk build 20191217.15 (#3873) - Microsoft.NET.Sdk - 3.1.200-preview.19617.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8aedb007fbeb..16a562e93ba2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli af3dd928e89be55ef417b0b01b3f693767bce131 - + https://github.com/dotnet/sdk - 27111f9d39aae0d41c0958b5f1445145bb05f994 + 7e7e3eab372d4c76824ba8c31b05f11b94b8a057 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 252b9a73ddbc..4cb12060d804 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19613.18 + 3.1.200-preview.19617.15 From 17d9077de44ed221913d8ee1311b5ae1aa7d76c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Dec 2019 01:12:19 +0000 Subject: [PATCH 375/896] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-cli build 20191217.2 - Microsoft.DotNet.Cli.Runtime - 3.1.101-servicing.19617.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a7086af6d3a..2e7c9140e73d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 2b25bd5b14de69a227490ed0e44b4475672d3ebe + 91705c83e44dd9221c3071e1bb7a87ba2f47688c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk diff --git a/eng/Versions.props b/eng/Versions.props index 52fe739c1038..409d5c6aee16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19616.2 + 3.1.101-servicing.19617.2 From 36aeef86e2ce31f3f7a13f6a251abfd0208e0c31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 01:38:23 +0000 Subject: [PATCH 376/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#13160) * Update dependencies from https://github.com/dotnet/sdk build 20191213.18 - Microsoft.NET.Sdk - 3.1.200-preview.19613.18 * Update dependencies from https://github.com/dotnet/sdk build 20191217.15 - Microsoft.NET.Sdk - 3.1.200-preview.19617.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95333fc4431d..e57395a9f3e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - e98d59e0cc80d22c6c56e5818cd62583973b6657 + 7e7e3eab372d4c76824ba8c31b05f11b94b8a057 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 56cccbd64e78..d1b8a842e772 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.19613.8 + 3.1.200-preview.19617.15 $(MicrosoftNETSdkPackageVersion) From 233832e0dd8b552e6f25b45509588312dfcbb1b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 03:15:23 +0000 Subject: [PATCH 377/896] Update dependencies from https://github.com/dotnet/cli build 20191217.3 (#3874) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19617.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16a562e93ba2..c8b0d820ff80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - af3dd928e89be55ef417b0b01b3f693767bce131 + 36aeef86e2ce31f3f7a13f6a251abfd0208e0c31 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4cb12060d804..d72255b8efbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19613.4 + 3.1.200-preview.19617.3 From 6c27ccc605339ca13aefc7f05e8fe8030437db6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 19:13:26 +0000 Subject: [PATCH 378/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6330 (#3879) - NuGet.Build.Tasks - 5.5.0-preview.1.6330 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8b0d820ff80..4b032a15b249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/wpf 427fa56aed34cbbc5096aa6137e748054905507d - + https://github.com/NuGet/NuGet.Client - ba2a72ac9afd9e7260798a6ad14088297570b350 + 6f7be0986028256f05c894eac2f7816c85611984 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d72255b8efbd..e212596b7242 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-preview.1.6319 + 5.5.0-preview.1.6330 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From e709f22343618ae5c98f6dfa49099833c0bc624e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 19:38:22 +0000 Subject: [PATCH 379/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6330 (#13161) - NuGet.Build.Tasks - 5.5.0-preview.1.6330 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e57395a9f3e4..ae9755be2516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,9 +56,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - ba2a72ac9afd9e7260798a6ad14088297570b350 + 6f7be0986028256f05c894eac2f7816c85611984 diff --git a/eng/Versions.props b/eng/Versions.props index d1b8a842e772..8ea1c68bf966 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.5.0-preview.1.6319 + 5.5.0-preview.1.6330 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 66f1a1e2a216f8bf094dd0b1c904f62eafdc3fd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 20:35:22 +0000 Subject: [PATCH 380/896] Update dependencies from https://github.com/dotnet/cli build 20191218.1 (#3880) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19618.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b032a15b249..91466b2eda91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 36aeef86e2ce31f3f7a13f6a251abfd0208e0c31 + e709f22343618ae5c98f6dfa49099833c0bc624e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e212596b7242..a426b3faf160 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19617.3 + 3.1.200-preview.19618.1 From 7063a4771f8b1f2c503af73c3e7e1f6e5bfd129b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2019 23:30:20 +0000 Subject: [PATCH 381/896] Update dependencies from https://github.com/dotnet/sdk build 20191219.2 (#3885) - Microsoft.NET.Sdk - 3.1.200-preview.19619.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91466b2eda91..4c9d87f9042e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli e709f22343618ae5c98f6dfa49099833c0bc624e - + https://github.com/dotnet/sdk - 7e7e3eab372d4c76824ba8c31b05f11b94b8a057 + 43c2cface2fdd4fdff1606919fb295e7166711f9 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index a426b3faf160..db82155291c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19617.15 + 3.1.200-preview.19619.2 From 8658034054535df58941d9223389786c19b92bbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2019 08:05:19 +0000 Subject: [PATCH 382/896] Update dependencies from https://github.com/dotnet/sdk build 20191219.4 (#3887) - Microsoft.NET.Sdk - 3.1.200-preview.19619.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c9d87f9042e..9bcdff68f9f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli e709f22343618ae5c98f6dfa49099833c0bc624e - + https://github.com/dotnet/sdk - 43c2cface2fdd4fdff1606919fb295e7166711f9 + 36cf3588bae9485ab2ac20104ee69de8270ad412 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index db82155291c3..04cdee492478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19619.2 + 3.1.200-preview.19619.4 From 5b54b31ddeacc0dc73cdfc5922f30670026018e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2019 08:34:16 +0000 Subject: [PATCH 383/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#13162) * Update dependencies from https://github.com/dotnet/sdk build 20191219.2 - Microsoft.NET.Sdk - 3.1.200-preview.19619.2 * Update dependencies from https://github.com/dotnet/sdk build 20191219.4 - Microsoft.NET.Sdk - 3.1.200-preview.19619.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae9755be2516..4fe1d41aa61c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 7e7e3eab372d4c76824ba8c31b05f11b94b8a057 + 36cf3588bae9485ab2ac20104ee69de8270ad412 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 8ea1c68bf966..f6da28ab4b83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.19617.15 + 3.1.200-preview.19619.4 $(MicrosoftNETSdkPackageVersion) From efd4239aad65650c5ea060157bfba6a340a46c29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2019 09:40:20 +0000 Subject: [PATCH 384/896] Update dependencies from https://github.com/dotnet/cli build 20191220.1 (#3888) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19620.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bcdff68f9f4..24b98fe8e1da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - e709f22343618ae5c98f6dfa49099833c0bc624e + 5b54b31ddeacc0dc73cdfc5922f30670026018e9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 04cdee492478..8a83a8fef7f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19618.1 + 3.1.200-preview.19620.1 From 37b6490871829bab98ffaf41a3ca2d7675cefca6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2019 07:25:20 +0000 Subject: [PATCH 385/896] Update dependencies from https://github.com/dotnet/sdk build 20191225.2 (#3915) - Microsoft.NET.Sdk - 3.1.200-preview.19625.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24b98fe8e1da..bf6293565a85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli 5b54b31ddeacc0dc73cdfc5922f30670026018e9 - + https://github.com/dotnet/sdk - 36cf3588bae9485ab2ac20104ee69de8270ad412 + 4a9be5b8dfb0c287883d3fd79c307f2bcfb41119 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8a83a8fef7f0..fee674ae1f99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19619.4 + 3.1.200-preview.19625.2 From 739cf24fe3be4044017493c7b698a04acb14b2d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2019 00:05:49 +0000 Subject: [PATCH 386/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6355 (#3926) - NuGet.Build.Tasks - 5.5.0-preview.2.6355 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf6293565a85..cd8814eaf0a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/wpf 427fa56aed34cbbc5096aa6137e748054905507d - + https://github.com/NuGet/NuGet.Client - 6f7be0986028256f05c894eac2f7816c85611984 + cb402b5a3340ab5b2605ecc72de7f70aaac95344 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index fee674ae1f99..f5af17518b42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-preview.1.6330 + 5.5.0-preview.2.6355 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 342dd011cf45b853ce9cb31fc6fed0eee32cafb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2019 00:35:56 +0000 Subject: [PATCH 387/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6355 (#13164) - NuGet.Build.Tasks - 5.5.0-preview.2.6355 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fe1d41aa61c..686559cc64d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,9 +56,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 6f7be0986028256f05c894eac2f7816c85611984 + cb402b5a3340ab5b2605ecc72de7f70aaac95344 diff --git a/eng/Versions.props b/eng/Versions.props index f6da28ab4b83..6bd87cb0bbe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.5.0-preview.1.6330 + 5.5.0-preview.2.6355 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From f7fb9f3f2dc646d0440a5bc8ebcd8e1d93dd21bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2019 01:30:22 +0000 Subject: [PATCH 388/896] Update dependencies from https://github.com/dotnet/cli build 20191227.1 (#3928) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19627.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd8814eaf0a0..c21605d07da9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 5b54b31ddeacc0dc73cdfc5922f30670026018e9 + 342dd011cf45b853ce9cb31fc6fed0eee32cafb7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f5af17518b42..45e446359c26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19620.1 + 3.1.200-preview.19627.1 From 55be78a9416f0289551c5d7827a1f4ae66a3b54b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2019 02:13:29 +0000 Subject: [PATCH 389/896] Update dependencies from https://github.com/dotnet/sdk build 20191225.2 (#13163) - Microsoft.NET.Sdk - 3.1.200-preview.19625.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686559cc64d0..d7e8084df917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 36cf3588bae9485ab2ac20104ee69de8270ad412 + 4a9be5b8dfb0c287883d3fd79c307f2bcfb41119 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 6bd87cb0bbe0..a0ca2d05fbcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.19619.4 + 3.1.200-preview.19625.2 $(MicrosoftNETSdkPackageVersion) From 97ce68ffbd0adbae892b8557c57977c95ab240e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2019 03:15:20 +0000 Subject: [PATCH 390/896] Update dependencies from https://github.com/dotnet/cli build 20191227.4 (#3929) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19627.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c21605d07da9..e4a63b283af1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 342dd011cf45b853ce9cb31fc6fed0eee32cafb7 + 55be78a9416f0289551c5d7827a1f4ae66a3b54b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 45e446359c26..d5a125f99931 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19627.1 + 3.1.200-preview.19627.4 From 558a059e2e5178a3ef208eb1f0294c3d460c462a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2019 03:00:19 +0000 Subject: [PATCH 391/896] Update dependencies from https://github.com/dotnet/fsharp build 20191228.1 (#3937) - Microsoft.FSharp.Compiler - 10.8.0-beta.19628.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4a63b283af1..ce3fc4b8a484 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - de637a9f6087a46cd45edda7aa1f461d88160d1a + a9ab2f0781a0ad38507a7e7cc241376f22531874 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d5a125f99931..092015e4e363 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19616.27 + 10.8.0-beta.19628.1 From 641278de6cf061249819d3af0e44573563678b03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 01:30:20 +0000 Subject: [PATCH 392/896] Update dependencies from https://github.com/dotnet/sdk build 20191230.1 (#3949) - Microsoft.NET.Sdk - 3.1.200-preview.19630.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce3fc4b8a484..45f12338ab76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli 55be78a9416f0289551c5d7827a1f4ae66a3b54b - + https://github.com/dotnet/sdk - 4a9be5b8dfb0c287883d3fd79c307f2bcfb41119 + 71f48b3241b93c00998336f947d146f57de93f4e https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 092015e4e363..78c376fd0f8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19625.2 + 3.1.200-preview.19630.1 From 0742c32d9a430e94e3a56b3863e4b649b5b65fb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 02:15:38 +0000 Subject: [PATCH 393/896] Update dependencies from https://github.com/dotnet/sdk build 20191230.1 (#13165) - Microsoft.NET.Sdk - 3.1.200-preview.19630.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7e8084df917..d67ec3303354 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 4a9be5b8dfb0c287883d3fd79c307f2bcfb41119 + 71f48b3241b93c00998336f947d146f57de93f4e https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index a0ca2d05fbcc..decee075ba79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.19625.2 + 3.1.200-preview.19630.1 $(MicrosoftNETSdkPackageVersion) From f50f837a1276c6066e31c1fa97bd6f99b7836cb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 02:25:20 +0000 Subject: [PATCH 394/896] Update dependencies from https://github.com/dotnet/fsharp build 20191230.1 (#3950) - Microsoft.FSharp.Compiler - 10.8.0-beta.19630.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45f12338ab76..a7759319aad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - a9ab2f0781a0ad38507a7e7cc241376f22531874 + 4224b3070a33029143e66cf152b0e4d2d5c3bfbd https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 78c376fd0f8f..0974d199f837 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19628.1 + 10.8.0-beta.19630.1 From 009fdd7fa26d1160a06ca2e8001bfbe9b1a0fb1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 03:10:21 +0000 Subject: [PATCH 395/896] Update dependencies from https://github.com/dotnet/cli build 20191230.1 (#3951) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.19630.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7759319aad1..b26993bbd0b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 55be78a9416f0289551c5d7827a1f4ae66a3b54b + 0742c32d9a430e94e3a56b3863e4b649b5b65fb2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0974d199f837..7b42a70ff9ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19627.4 + 3.1.200-preview.19630.1 From 18adba622401012165c00cc77b2d06fcd1c0bdc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2020 09:10:20 +0000 Subject: [PATCH 396/896] Update dependencies from https://github.com/dotnet/fsharp build 20191231.1 (#3958) - Microsoft.FSharp.Compiler - 10.8.0-beta.19631.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b26993bbd0b0..3695a325060c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 4224b3070a33029143e66cf152b0e4d2d5c3bfbd + 5771279d901fb027c92154deb7d3dc86e0d21d85 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7b42a70ff9ac..f8a33a41c3a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19630.1 + 10.8.0-beta.19631.1 From fbd8f7a1f552df1a31271e9f66f31b6567fdf433 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2020 00:21:11 +0000 Subject: [PATCH 397/896] Update dependencies from https://github.com/dotnet/fsharp build 20200103.2 (#3974) - Microsoft.FSharp.Compiler - 10.8.0-beta.20053.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3695a325060c..5263d5517697 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 5771279d901fb027c92154deb7d3dc86e0d21d85 + f7578dfc0bccd686bfcde1ca0a980f4f677cdba0 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f8a33a41c3a4..922d3c53de8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.19631.1 + 10.8.0-beta.20053.2 From 129909a83c509bae9e00a3f2aa429773f8da857e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 20:10:21 +0000 Subject: [PATCH 398/896] Update dependencies from https://github.com/dotnet/sdk build 20200107.1 (#3998) - Microsoft.NET.Sdk - 3.1.200-preview.20057.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5263d5517697..2cba0067a6d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli 0742c32d9a430e94e3a56b3863e4b649b5b65fb2 - + https://github.com/dotnet/sdk - 71f48b3241b93c00998336f947d146f57de93f4e + 831a360a52d5a24604794fb7a06e14c3065c31b5 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 922d3c53de8b..a599eb7a1eb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.19630.1 + 3.1.200-preview.20057.1 From b622a69ac557e1d7953e47082e7161b5587e8e4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 20:35:21 +0000 Subject: [PATCH 399/896] Update dependencies from https://github.com/dotnet/fsharp build 20200107.4 (#4000) - Microsoft.FSharp.Compiler - 10.8.0-beta.20057.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cba0067a6d6..f1c2a03c31ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - f7578dfc0bccd686bfcde1ca0a980f4f677cdba0 + 072d731027134b5c502c0d6e504065d375ff2c0b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a599eb7a1eb9..20e924a0089d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20053.2 + 10.8.0-beta.20057.4 From ba3a79c8b9a11d6043053b447887bcf4a3de480e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 20:35:33 +0000 Subject: [PATCH 400/896] Update dependencies from https://github.com/dotnet/sdk build 20200107.1 (#13168) - Microsoft.NET.Sdk - 3.1.200-preview.20057.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d67ec3303354..7a3c7d1ec1e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 71f48b3241b93c00998336f947d146f57de93f4e + 831a360a52d5a24604794fb7a06e14c3065c31b5 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index decee075ba79..b71d61d20752 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.19630.1 + 3.1.200-preview.20057.1 $(MicrosoftNETSdkPackageVersion) From 5a6e6e9b035bb9c380d848a776ed1f1ecf95d934 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 7 Jan 2020 13:29:33 -0800 Subject: [PATCH 401/896] Revert to 3.1.0 versions (#4001) --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c2a03c31ab..41d5c7fe5921 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/roslyn d2bd58c62f9104d66f415141a1a27b665c78690c - + https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + 29036777e7cd2172a81c45c69e0dc257e8b8184e diff --git a/eng/Versions.props b/eng/Versions.props index 20e924a0089d..78f9867f0c7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1-servicing.19577.2 + 3.1.0 From 0f023b5a59896607ad1f17445302ae52f8b6b0ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 21:35:24 +0000 Subject: [PATCH 402/896] Update dependencies from https://github.com/dotnet/cli build 20200107.1 (#4002) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20057.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41d5c7fe5921..6d9fa817ffe0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 0742c32d9a430e94e3a56b3863e4b649b5b65fb2 + ba3a79c8b9a11d6043053b447887bcf4a3de480e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 78f9867f0c7d..7b048eacca07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.19630.1 + 3.1.200-preview.20057.1 From 3e2d9bdfc742b650c312966a734b38a31c061de4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 22:50:18 +0000 Subject: [PATCH 403/896] Update dependencies from https://github.com/aspnet/websdk build 20200107.3 (#4004) - Microsoft.NET.Sdk.Web - 3.1.200-preview.20057.3 --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index a47e0b0b00a7..0f5975722922 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d9fa817ffe0..83ea897f9b5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 72a4eb78f1aa8af48f6fd7441fccea38639d9d6d + ba45e562288bf3d82e6c0d7d573c922948cfa4d1 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 7b048eacca07..7fdd766a28cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.100-rtm.19575.2 + 3.1.200-preview.20057.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From c9b17f87c21596d7388be27aec72b55273393ad4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 00:15:20 +0000 Subject: [PATCH 404/896] Update dependencies from https://github.com/dotnet/fsharp build 20200107.11 (#4005) - Microsoft.FSharp.Compiler - 10.8.0-beta.20057.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83ea897f9b5e..1b990f517523 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 072d731027134b5c502c0d6e504065d375ff2c0b + e42f520af700dda9d78d178bc28d231c4798b30a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7fdd766a28cb..9bd555b2c564 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20057.4 + 10.8.0-beta.20057.11 From c98789b9a1ffee7f92b03d7a4311de4d39fd8bfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 04:05:20 +0000 Subject: [PATCH 405/896] Update dependencies from https://github.com/dotnet/fsharp build 20200107.12 (#4006) - Microsoft.FSharp.Compiler - 10.8.0-beta.20057.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b990f517523..2bc0d46dd758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - e42f520af700dda9d78d178bc28d231c4798b30a + fd8da613348a18904386a868247752f18bbaaba3 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 9bd555b2c564..611c63cf9599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20057.11 + 10.8.0-beta.20057.12 From 7b624e1362792ffd2df047ace9d3a3a27f619390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 21:40:20 +0000 Subject: [PATCH 406/896] Update dependencies from https://github.com/dotnet/sdk build 20200108.1 (#4012) - Microsoft.NET.Sdk - 3.1.200-preview.20058.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bc0d46dd758..8b7e7c9ba977 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli ba3a79c8b9a11d6043053b447887bcf4a3de480e - + https://github.com/dotnet/sdk - 831a360a52d5a24604794fb7a06e14c3065c31b5 + 7a8c66ba63c88ffb13e509e46c5b83398a928683 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 611c63cf9599..7d1a95ea3c3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20057.1 + 3.1.200-preview.20058.1 From 484c29277d0875667b4b66104d2090739730f675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 22:05:34 +0000 Subject: [PATCH 407/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#13169) * Update dependencies from https://github.com/dotnet/sdk build 20200108.1 - Microsoft.NET.Sdk - 3.1.200-preview.20058.1 * Adjust tests for no default apphost on mac Co-authored-by: William Li --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../Assertions/AssertionHelper.cs | 21 +++++++++++++++++++ .../PlatformSpecificFact.cs | 20 ++++++++++++++++++ .../PlatformSpecificTheory.cs | 20 ++++++++++++++++++ .../GivenDotnetPublishPublishesProjects.cs | 5 ++--- .../GivenDotnetRunRunsCsProj.cs | 2 +- 7 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a3c7d1ec1e0..86b2d6a6819f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 831a360a52d5a24604794fb7a06e14c3065c31b5 + 7a8c66ba63c88ffb13e509e46c5b83398a928683 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index b71d61d20752..abc0a5b0bb64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.20057.1 + 3.1.200-preview.20058.1 $(MicrosoftNETSdkPackageVersion) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs new file mode 100644 index 000000000000..7bea9b5d7b73 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs @@ -0,0 +1,21 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + using System.Linq; + using Microsoft.DotNet.Cli.Utils; + using Microsoft.DotNet.PlatformAbstractions; + + public static class AssertionHelper + { + public static string[] AppendApphostOnNonMacOS(string ProjectName, string[] expectedFiles) + { + string apphost = $"{ProjectName}{Constants.ExeSuffix}"; + // No UseApphost is false by default on macOS + return RuntimeEnvironment.OperatingSystemPlatform != Platform.Darwin + ? expectedFiles.Append(apphost).ToArray() + : expectedFiles; + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs new file mode 100644 index 000000000000..9a161df22587 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using Microsoft.DotNet.PlatformAbstractions; +using Xunit; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public class PlatformSpecificFact : FactAttribute + { + public PlatformSpecificFact(params Platform[] platforms) + { + if (!platforms.Contains(RuntimeEnvironment.OperatingSystemPlatform)) + { + this.Skip = "This test is not supported on this platform."; + } + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs new file mode 100644 index 000000000000..158cb607f06b --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using Microsoft.DotNet.PlatformAbstractions; +using Xunit; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public class PlatformSpecificTheory : TheoryAttribute + { + public PlatformSpecificTheory(params Platform[] platforms) + { + if (!platforms.Contains(RuntimeEnvironment.OperatingSystemPlatform)) + { + this.Skip = "This test is not supported on this platform."; + } + } + } +} diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 260b19bdf856..ba60d5c15b0b 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -152,13 +152,12 @@ public void ItPublishesFrameworkDependentWithoutRid(string args) var testAppName = "MSBuildTestApp"; var outputDirectory = PublishApp(testAppName, rid: null, args: args); - outputDirectory.Should().OnlyHaveFiles(new[] { - $"{testAppName}{Constants.ExeSuffix}", + outputDirectory.Should().OnlyHaveFiles(AssertionHelper.AppendApphostOnNonMacOS(testAppName, new[] { $"{testAppName}.dll", $"{testAppName}.pdb", $"{testAppName}.deps.json", $"{testAppName}.runtimeconfig.json", - }); + })); new DotnetCommand() .ExecuteWithCapturedOutput(Path.Combine(outputDirectory.FullName, $"{testAppName}.dll")) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 8515fa6e5198..94884ecd0da8 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -698,7 +698,7 @@ public void ItRunsWithDotnetWithoutApphost() .HaveStdOutContaining($"dotnet{Constants.ExeSuffix}"); } - [Fact] + [PlatformSpecificFact(Platform.Windows, Platform.Linux, Platform.FreeBSD)] public void ItRunsWithApphost() { var testInstance = TestAssets.Get("AppOutputsExecutablePath").CreateInstance().WithSourceFiles(); From dca41435bfb687104418202943f35963735ceb34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jan 2020 22:50:11 +0000 Subject: [PATCH 408/896] Update dependencies from https://github.com/dotnet/fsharp build 20200108.11 - Microsoft.FSharp.Compiler - 10.8.0-beta.20058.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b7e7c9ba977..d81e521acb6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - fd8da613348a18904386a868247752f18bbaaba3 + 9d29b799d4b04170ce0aac9aac7e99aaf0e7d635 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7d1a95ea3c3d..f2fe75b8567e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20057.12 + 10.8.0-beta.20058.11 From fe57310ce46fd1cfb9292fa8e2dfdad7c6a63244 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jan 2020 22:55:11 +0000 Subject: [PATCH 409/896] Update dependencies from https://github.com/dotnet/cli build 20200108.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20058.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b7e7c9ba977..cc79f14ed0d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - ba3a79c8b9a11d6043053b447887bcf4a3de480e + 484c29277d0875667b4b66104d2090739730f675 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7d1a95ea3c3d..fa9b8321ee93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20057.1 + 3.1.200-preview.20058.1 From 85ce0bd787a8bbdb04525926dce5f55f4c7d5461 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2020 23:15:21 +0000 Subject: [PATCH 410/896] Update dependencies from https://github.com/dotnet/fsharp build 20200109.12 (#4024) - Microsoft.FSharp.Compiler - 10.8.0-beta.20059.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1cab0c46620..db53350b6369 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild e901037fe1815eae17424f860412d0b967d09461 - + https://github.com/dotnet/fsharp - 9d29b799d4b04170ce0aac9aac7e99aaf0e7d635 + f5ae7d7ecdacf0c49877fce3f13b0a8efb444e1b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a5199085dec0..8c2c8e1264bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20058.11 + 10.8.0-beta.20059.12 From 2c56fe42d7a61866512ddf22c373fd96367b8e21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jan 2020 00:20:08 +0000 Subject: [PATCH 411/896] Update dependencies from https://github.com/dotnet/sdk build 20200109.2 - Microsoft.NET.Sdk - 3.1.200-preview.20059.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b2d6a6819f..8ef6ddf2e380 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 7a8c66ba63c88ffb13e509e46c5b83398a928683 + b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index abc0a5b0bb64..a63b1a924149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.20058.1 + 3.1.200-preview.20059.2 $(MicrosoftNETSdkPackageVersion) From 1f6f3b680b5207ccf36826df7472c9f49441b75b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2020 00:30:19 +0000 Subject: [PATCH 412/896] Update dependencies from https://github.com/dotnet/sdk build 20200109.2 (#4025) - Microsoft.NET.Sdk - 3.1.200-preview.20059.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db53350b6369..e20995108b47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/cli 484c29277d0875667b4b66104d2090739730f675 - + https://github.com/dotnet/sdk - 7a8c66ba63c88ffb13e509e46c5b83398a928683 + b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8c2c8e1264bc..c1492e3a3da7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20058.1 + 3.1.200-preview.20059.2 From 3fea818bb99839eec8b1ef3f9e70094f0e664040 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2020 08:35:23 +0000 Subject: [PATCH 413/896] Update dependencies from https://github.com/dotnet/cli build 20200109.1 (#4027) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20059.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e20995108b47..50957bac5f06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/cli - 484c29277d0875667b4b66104d2090739730f675 + cbf29e13514ba9d3be54eff7ccfe4b9df93e581b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c1492e3a3da7..0fd3816a20d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20058.1 + 3.1.200-preview.20059.1 From 2e7c78e7e50e76644a0b5e5c27eef86837a594bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 00:09:30 +0000 Subject: [PATCH 414/896] Update dependencies from https://github.com/microsoft/msbuild build 20200114.6 (#4050) - Microsoft.Build.Localization - 16.5.0-preview-20064-06 - Microsoft.Build - 16.5.0-preview-20064-06 --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f5975722922..2c212c5a2d7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50957bac5f06..192882b8c9ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,13 +13,13 @@ https://github.com/dotnet/sdk b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 - + https://github.com/microsoft/msbuild - e901037fe1815eae17424f860412d0b967d09461 + 86d9494e446de002ea6a4f08d6fbd111b1041059 - + https://github.com/microsoft/msbuild - e901037fe1815eae17424f860412d0b967d09461 + 86d9494e446de002ea6a4f08d6fbd111b1041059 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0fd3816a20d9..1e418323c0d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.4.0 + 16.5.0-preview-20064-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.4.0-preview-19565-01 + 16.5.0-preview-20064-06 $(MicrosoftBuildPackageVersion) From 68670c8e0aa7f0b700fc38a6da631f24f7f95ba5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 14 Jan 2020 18:03:31 -0800 Subject: [PATCH 415/896] Remove internal feeds --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 6918fa4408c4..e228c2b748b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - From 49df1781be096d2a0f79fc1d7d64f73eba27fb77 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 14 Jan 2020 18:04:14 -0800 Subject: [PATCH 416/896] Bump branding to 3.1.102 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a68c601aae99..581221d7e701 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.101 + 3.1.102 servicing From 1be63e014ae52a5f643badc317b2992b4611c655 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 14 Jan 2020 18:19:15 -0800 Subject: [PATCH 417/896] Remove internal feeds --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93ae591f817a..a47e0b0b00a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,6 @@ - - From 85164d712819c56b6cd91765c3c3eba757091dcb Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 14 Jan 2020 18:19:55 -0800 Subject: [PATCH 418/896] Bump branding to 3.1.102 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 409d5c6aee16..6eb089f8e2ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.101 + 3.1.102 servicing From 637db2820de3c8836ce023b6f326ac17ee6d1b7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 06:20:20 +0000 Subject: [PATCH 419/896] Update dependencies from https://github.com/dotnet/fsharp build 20200114.9 (#4054) - Microsoft.FSharp.Compiler - 10.8.0-beta.20064.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 192882b8c9ef..85756b4e44d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild 86d9494e446de002ea6a4f08d6fbd111b1041059 - + https://github.com/dotnet/fsharp - f5ae7d7ecdacf0c49877fce3f13b0a8efb444e1b + 6ccd253d8016cce48b0725a41d1e614f7d869dd0 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1e418323c0d1..1adcb3593995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20059.12 + 10.8.0-beta.20064.9 From fcf2797e371992a302f05c6470d306412f704fea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jan 2020 18:37:58 +0000 Subject: [PATCH 420/896] Update dependencies from https://github.com/dotnet/sdk build 20200114.7 - Microsoft.NET.Sdk - 3.1.102-servicing.20064.7 --- NuGet.config | 1 + eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..6918fa4408c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1170d63d3347..adb2bc973efc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 + + https://github.com/dotnet/sdk + 801d77cd708b8baeb56d2427b525be38ff785f40 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 581221d7e701..2ce80e08d916 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.101-servicing.19617.12 + 3.1.102-servicing.20064.7 $(MicrosoftNETSdkPackageVersion) From 5c371c8c4a483a00eebec841049d65e4ee328ded Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jan 2020 19:40:12 +0000 Subject: [PATCH 421/896] Update dependencies from https://github.com/dotnet/sdk build 20200115.3 - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adb2bc973efc..e0783a55fb92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - 801d77cd708b8baeb56d2427b525be38ff785f40 + 595244ad4a8c4ab7be4e4a78641f4da7b4361aae https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2ce80e08d916..2a1c470528ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.102-servicing.20064.7 + 3.1.102-servicing.20065.3 $(MicrosoftNETSdkPackageVersion) From 8561f20ba07357d7f75742c9a2583ffb3535dd57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 19:40:20 +0000 Subject: [PATCH 422/896] Update dependencies from https://github.com/dotnet/fsharp build 20200115.1 (#4062) - Microsoft.FSharp.Compiler - 10.8.0-beta.20065.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85756b4e44d2..1299643b43fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild 86d9494e446de002ea6a4f08d6fbd111b1041059 - + https://github.com/dotnet/fsharp - 6ccd253d8016cce48b0725a41d1e614f7d869dd0 + 1d58e5d911c62ebcaae64f6f8fa2504afce0a369 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1adcb3593995..4869c3fedf49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20064.9 + 10.8.0-beta.20065.1 From b323ed69525128b2d14e02c101c3a9d2e9bddcc8 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 15 Jan 2020 13:22:36 -0800 Subject: [PATCH 423/896] Remove internal feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 6918fa4408c4..e228c2b748b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - From 158eb7b5ae7c50837eed0d1deea0403956aaa0cf Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 31 Dec 2019 10:29:03 -0800 Subject: [PATCH 424/896] Adjust tests for no default apphost on mac --- .../Assertions/AssertionHelper.cs | 21 +++++++++++++++++++ .../PlatformSpecificFact.cs | 20 ++++++++++++++++++ .../PlatformSpecificTheory.cs | 20 ++++++++++++++++++ .../GivenDotnetPublishPublishesProjects.cs | 5 ++--- .../GivenDotnetRunRunsCsProj.cs | 2 +- 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs new file mode 100644 index 000000000000..7bea9b5d7b73 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/AssertionHelper.cs @@ -0,0 +1,21 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + using System.Linq; + using Microsoft.DotNet.Cli.Utils; + using Microsoft.DotNet.PlatformAbstractions; + + public static class AssertionHelper + { + public static string[] AppendApphostOnNonMacOS(string ProjectName, string[] expectedFiles) + { + string apphost = $"{ProjectName}{Constants.ExeSuffix}"; + // No UseApphost is false by default on macOS + return RuntimeEnvironment.OperatingSystemPlatform != Platform.Darwin + ? expectedFiles.Append(apphost).ToArray() + : expectedFiles; + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs new file mode 100644 index 000000000000..9a161df22587 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificFact.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using Microsoft.DotNet.PlatformAbstractions; +using Xunit; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public class PlatformSpecificFact : FactAttribute + { + public PlatformSpecificFact(params Platform[] platforms) + { + if (!platforms.Contains(RuntimeEnvironment.OperatingSystemPlatform)) + { + this.Skip = "This test is not supported on this platform."; + } + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs new file mode 100644 index 000000000000..158cb607f06b --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/PlatformSpecificTheory.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using Microsoft.DotNet.PlatformAbstractions; +using Xunit; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public class PlatformSpecificTheory : TheoryAttribute + { + public PlatformSpecificTheory(params Platform[] platforms) + { + if (!platforms.Contains(RuntimeEnvironment.OperatingSystemPlatform)) + { + this.Skip = "This test is not supported on this platform."; + } + } + } +} diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 260b19bdf856..ba60d5c15b0b 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -152,13 +152,12 @@ public void ItPublishesFrameworkDependentWithoutRid(string args) var testAppName = "MSBuildTestApp"; var outputDirectory = PublishApp(testAppName, rid: null, args: args); - outputDirectory.Should().OnlyHaveFiles(new[] { - $"{testAppName}{Constants.ExeSuffix}", + outputDirectory.Should().OnlyHaveFiles(AssertionHelper.AppendApphostOnNonMacOS(testAppName, new[] { $"{testAppName}.dll", $"{testAppName}.pdb", $"{testAppName}.deps.json", $"{testAppName}.runtimeconfig.json", - }); + })); new DotnetCommand() .ExecuteWithCapturedOutput(Path.Combine(outputDirectory.FullName, $"{testAppName}.dll")) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 8515fa6e5198..94884ecd0da8 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -698,7 +698,7 @@ public void ItRunsWithDotnetWithoutApphost() .HaveStdOutContaining($"dotnet{Constants.ExeSuffix}"); } - [Fact] + [PlatformSpecificFact(Platform.Windows, Platform.Linux, Platform.FreeBSD)] public void ItRunsWithApphost() { var testInstance = TestAssets.Get("AppOutputsExecutablePath").CreateInstance().WithSourceFiles(); From ba5bdf3bb85699cfe195ddf0dde29fdae2c49dd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 22:10:47 +0000 Subject: [PATCH 425/896] [release/3.1.1xx] Update dependencies from dotnet/templating (#13182) * Update dependencies from https://github.com/dotnet/templating build 20200114.1 - Microsoft.TemplateEngine.Cli - 3.1.2-servicing.20064.1 * Remove internal feed Co-authored-by: William Li --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1170d63d3347..32762a23435d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 581221d7e701..1d9bb95aa066 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.1.1-servicing.19605.2 + 3.1.2-servicing.20064.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 61edf242668b7bdac8b055fa6c029a1585b7ba12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 14:45:08 -0800 Subject: [PATCH 426/896] [release/3.1.1xx] Update dependencies from dotnet/aspnetcore-tooling (#4067) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200114.7 - Microsoft.NET.Sdk.Razor - 3.1.2 * fixup nuget.config Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index a47e0b0b00a7..9a114109a731 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e7c9140e73d..580500e209a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn 165046097562cfe65b09c2e9a9d8f7cd88526f2c - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 5b1e2250227211cfbbcd995a4eb37ee8224bb074 diff --git a/eng/Versions.props b/eng/Versions.props index 6eb089f8e2ad..f7707e0cdce8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1 + 3.1.2 From 8442efa9bca6ccf9c0106d29e259a396cfdda807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 22:51:11 +0000 Subject: [PATCH 427/896] [release/3.1.1xx] Update dependencies from dotnet/sdk (#4061) * Update dependencies from https://github.com/dotnet/sdk build 20200114.7 - Microsoft.NET.Sdk - 3.1.102-servicing.20064.7 * Update dependencies from https://github.com/dotnet/sdk build 20200115.3 - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 * fixup nuget.config Co-authored-by: William Godbe --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 580500e209a3..475a63d7124a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-cli 91705c83e44dd9221c3071e1bb7a87ba2f47688c - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 + + https://github.com/dotnet/sdk + 595244ad4a8c4ab7be4e4a78641f4da7b4361aae https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f7707e0cdce8..f1bc7c22d5eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.101-servicing.19617.12 + 3.1.102-servicing.20065.3 From 5b3a46bf170343fd4de0c92dd4d1ca8ef66a8d59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 23:09:51 +0000 Subject: [PATCH 428/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13181) * Update dependencies from https://github.com/dotnet/core-setup build 20200114.3 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * fixup nuget.config Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..bc64f7a0f6e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32762a23435d..c0558382c088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,25 +5,25 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 1d9bb95aa066..c4bb8454c9f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,13 +18,13 @@ 3.1.0 - 3.1.1 + 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19608.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 + 3.1.2-servicing.20064.3 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 From 4bb169219ef64e76fa4b8e304625b5c51e354ecb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 23:35:07 +0000 Subject: [PATCH 429/896] Update dependencies from https://github.com/dotnet/cli build 20200114.4 (#4060) - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20064.4 Co-authored-by: William Li --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 475a63d7124a..680db8b3ad7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 91705c83e44dd9221c3071e1bb7a87ba2f47688c + + https://github.com/dotnet/cli + 2df60fca25e046f5317672d5b40fa758d80b09bc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f1bc7c22d5eb..e178c80be32e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.101-servicing.19617.2 + 3.1.102-servicing.20064.4 From fa3d39113365a88831c8ffb74ac656f22ed2cf14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 23:51:17 +0000 Subject: [PATCH 430/896] [release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#13187) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200115.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20065.6 * Remove internal feed Co-authored-by: William Li --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 800752b27d7a..942668d77b9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe diff --git a/eng/Versions.props b/eng/Versions.props index cbad0b3602a7..e750f7362e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.1-servicing.19615.10 + 3.1.2-servicing.20065.6 From cf9459080eeb95580c8ba145a5f9f83e5500a6e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 23:56:26 +0000 Subject: [PATCH 431/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#4068) * Update dependencies from https://github.com/dotnet/core-setup build 20200114.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 Dependency coherency updates - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) * fixup nuget.config * fixup nuget.config * fix versions.details.xml * fix versions.props Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a114109a731..726752afd6ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 680db8b3ad7f..644e35fdbb1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e178c80be32e..ec8663c3cd4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 3.1.0 - 3.1.1-servicing.19608.4 - 3.1.1 + 3.1.2-servicing.20064.3 + 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 60ad568d16e38c2406d5104720f574996bbcbcfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 17:02:54 +0000 Subject: [PATCH 432/896] [release/3.1.1xx] Update dependencies from dotnet/cli (#4069) * Update dependencies from https://github.com/dotnet/cli build 20200115.1 - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20065.1 * Update dependencies from https://github.com/dotnet/cli build 20200115.6 - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20065.6 * Update dependencies from https://github.com/dotnet/cli build 20200115.7 - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20065.7 * Update dependencies from https://github.com/dotnet/cli build 20200115.11 - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20065.11 Co-authored-by: Sarah Oslund --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 644e35fdbb1b..5608e75c68bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - + https://github.com/dotnet/cli - 2df60fca25e046f5317672d5b40fa758d80b09bc + fa3d39113365a88831c8ffb74ac656f22ed2cf14 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ec8663c3cd4d..970d70612bfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.102-servicing.20064.4 + 3.1.102-servicing.20065.11 From 3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 10:12:03 -0800 Subject: [PATCH 433/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13188) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.5 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.9 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.10 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.12 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.14 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.14 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200116.1 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Add System.Text.Json to nuget.config Co-authored-by: William Godbe --- NuGet.config | 3 ++- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++++- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc64f7a0f6e0..11bd8f1d0827 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 942668d77b9f..2ed267ab7565 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,29 +7,29 @@ https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f - + https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + 07080ceab1e5b305d8a5fecd9d5b793fb502d57a https://github.com/dotnet/aspnetcore @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - + https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e750f7362e08..383a8fa4ca2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,12 +20,16 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20064.3 + 3.1.2-servicing.20066.1 3.1.2 3.1.2 3.1.2 3.1.2 + + + 4.7.1 + 3.1.2-servicing.20065.6 From 32af84f8dc7b2e18a9eb2ade7651fa42d5bc8576 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 20:30:58 +0000 Subject: [PATCH 434/896] [release/3.1.1xx] Update dependencies from dotnet/cli (#4079) * Update dependencies from https://github.com/dotnet/cli build 20200116.4 - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20066.4 * Update NuGet.config Co-authored-by: Nick Guerrera --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5608e75c68bb..af057cb095b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - + https://github.com/dotnet/cli - fa3d39113365a88831c8ffb74ac656f22ed2cf14 + 3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 970d70612bfa..a3db7a81c993 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.102-servicing.20065.11 + 3.1.102-servicing.20066.4 From 2dea0dae80d9fa94a3f864fc218496ecc7712ba7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 03:23:54 +0000 Subject: [PATCH 435/896] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#13193) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.6 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 Dependency coherency updates - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.9 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200116.11 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.11 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 Dependency coherency updates - System.Text.Json - 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11bd8f1d0827..fd756789afd8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ed267ab7565..82715b947d3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,29 +7,29 @@ https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/corefx - 07080ceab1e5b305d8a5fecd9d5b793fb502d57a + d658fef8c064c2f3ea4f57ab6544abb998ab3b57 https://github.com/dotnet/aspnetcore @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - + https://github.com/dotnet/core-setup - 582ca1fbb0cb2dc7f4a6d1a60b69802b6aab592f + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 383a8fa4ca2c..839b77c363dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20066.1 + 3.1.2-servicing.20066.11 3.1.2 3.1.2 3.1.2 From 74feb5817f78fd21026c9b85dc2ac2a53a34e7ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 13:25:53 +0000 Subject: [PATCH 436/896] Update dependencies from https://github.com/dotnet/core-setup build 20200117.1 (#13196) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd756789afd8..5de7feaf8311 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82715b947d3a..ef9dd141b32e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,23 +7,23 @@ https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - + https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 76cc488b8c942815d8b4bfe1de803b916667fe37 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 839b77c363dd..2311111a6e33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20066.11 + 3.1.2-servicing.20067.1 3.1.2 3.1.2 3.1.2 From aff7372b82aaa91166dec74d5da44d48508f0af1 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Fri, 17 Jan 2020 14:37:14 -0800 Subject: [PATCH 437/896] Fix bad merge --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + 2 files changed, 5 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae47ab7fe1ce..de737ebcefbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,6 +52,10 @@ https://github.com/dotnet/sdk b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 + + https://github.com/dotnet/core-setup + 76cc488b8c942815d8b4bfe1de803b916667fe37 + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index a83f194b6676..3fd31b6c3133 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,6 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + 3.1.2-servicing.20067.1 3.1.2 3.1.2 3.1.2 From 1fc87580eb87b46d4d7bda40b989d3d00879f109 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Fri, 17 Jan 2020 15:16:17 -0800 Subject: [PATCH 438/896] Adding internal package version to versions.details.xml --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed0126bab9d1..6ed49d695f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,6 +5,10 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 + https://github.com/dotnet/cli cbf29e13514ba9d3be54eff7ccfe4b9df93e581b From 2c11da834b80b019651861a3364d2501d803f48f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 16:03:49 -0800 Subject: [PATCH 439/896] Update dependencies from https://github.com/dotnet/core-setup build 20200117.4 (#13199) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 Dependency coherency updates - System.Text.Json - 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5de7feaf8311..422b319cc6e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef9dd141b32e..af8ea0fa9238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,29 +7,29 @@ https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/corefx - d658fef8c064c2f3ea4f57ab6544abb998ab3b57 + e946cebe43a510e8c6476bbc8185d1445df33a1a https://github.com/dotnet/aspnetcore @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - + https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 2311111a6e33..b86b47a80fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20067.1 + 3.1.2-servicing.20067.4 3.1.2 3.1.2 3.1.2 From 9dd5dd9f0cf0b48d4d97ad628ca230df3c072d42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 21:11:48 +0000 Subject: [PATCH 440/896] [release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#13194) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.1 Dependency coherency updates - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.4 Dependency coherency updates - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.14 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.15 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.15 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1 * Fix system.text.json version Co-authored-by: William Godbe --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8ea0fa9238..059d0439f1b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx e946cebe43a510e8c6476bbc8185d1445df33a1a - + https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc diff --git a/eng/Versions.props b/eng/Versions.props index b86b47a80fe8..9a0a81963a30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 3.1.2-servicing.20065.6 + 3.1.2-servicing.20068.1 From 32fddd23b1e53272472f6feb27f5e12a445b7236 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2020 09:40:35 +0000 Subject: [PATCH 441/896] Update dependencies from https://github.com/dotnet/sdk build 20200118.5 (#13200) - Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 059d0439f1b6..112cbdbbd8e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - 595244ad4a8c4ab7be4e4a78641f4da7b4361aae + 90a093bbbe2c46ef19e301d717bed3cfaa56abb3 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 9a0a81963a30..6302187d7a1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.102-servicing.20065.3 + 3.1.102-servicing.20068.5 $(MicrosoftNETSdkPackageVersion) From d449569824967fbcc1b6b7d43815f8c4c9678eb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 11:00:42 +0000 Subject: [PATCH 442/896] Update dependencies from https://github.com/dotnet/core-setup build 20200120.1 (#13201) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20070.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 - Microsoft.DotNet.PlatformAbstractions - 3.1.2 - Microsoft.NET.HostModel - 3.1.2 - Microsoft.Extensions.DependencyModel - 3.1.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 422b319cc6e2..36750d2c9f6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 112cbdbbd8e3..804006afdc62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,23 +7,23 @@ https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb @@ -52,9 +52,9 @@ https://github.com/NuGet/NuGet.Client 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 6302187d7a1c..ff2fd2feb31d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20067.4 + 3.1.2-servicing.20070.1 3.1.2 3.1.2 3.1.2 From 77b97cb73054115fb2158b52335782c6c872a54c Mon Sep 17 00:00:00 2001 From: sfoslund Date: Tue, 21 Jan 2020 15:39:35 -0800 Subject: [PATCH 443/896] Updating nuget.config with feed for internalPackageVersion --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 2c212c5a2d7f..137cf4ae3a2f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + From 2ee3531f46b3a2d19e96bc5d498f7103ef8c4ae1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 02:25:19 +0000 Subject: [PATCH 444/896] Update dependencies from https://github.com/dotnet/fsharp build 20200121.14 (#4118) - Microsoft.FSharp.Compiler - 10.8.0-beta.20071.14 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c212c5a2d7f..8c4aba1ea30b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1299643b43fb..bf093f7d6ffb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ https://github.com/microsoft/msbuild 86d9494e446de002ea6a4f08d6fbd111b1041059 - + https://github.com/dotnet/fsharp - 1d58e5d911c62ebcaae64f6f8fa2504afce0a369 + c4c09df4d5a68c3e9a51948bab554d11e2c141f2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4869c3fedf49..64f747f5c3bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20065.1 + 10.8.0-beta.20071.14 From 6dea6adc971266b2057a111b788e390d34d554b8 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 22 Jan 2020 08:59:46 -0800 Subject: [PATCH 445/896] Updating razor version details --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b9eff693dad..fdbddfb3b95f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,9 +33,9 @@ https://github.com/dotnet/roslyn d2bd58c62f9104d66f415141a1a27b665c78690c - - https://github.com/aspnet/AspNetCore-Tooling - 29036777e7cd2172a81c45c69e0dc257e8b8184e + + https://github.com/dotnet/aspnetcore-tooling + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 From 25cb182105f8ce3d94abda7f511dda31ce033cf7 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 22 Jan 2020 09:11:29 -0800 Subject: [PATCH 446/896] Updating razor feed for nuget.config --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 137cf4ae3a2f..215a1bc60f1d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + From 689c0480aa93d33c94881b44568585e5ebf61740 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 22 Jan 2020 12:42:01 -0800 Subject: [PATCH 447/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5ef349670b91..c5e77fa2b41c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.200-preview-014770", + "dotnet": "3.1.200-preview-014935", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From 6ae6c4ec654218a44f228f3409c81227b9986848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 01:20:35 +0000 Subject: [PATCH 448/896] Update dependencies from https://github.com/dotnet/sdk build 20200122.3 (#13203) - Microsoft.NET.Sdk - 3.1.200-preview.20072.3 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..283ad6849da4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ef6ddf2e380..c19362f9c768 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 + 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index a63b1a924149..4532450c0b28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 3.1.200-preview.20059.2 + 3.1.200-preview.20072.3 $(MicrosoftNETSdkPackageVersion) From 88dd478874338d15c94a824bcaa7ce8e4385387f Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 23 Jan 2020 10:54:34 -0800 Subject: [PATCH 449/896] Updating stage 0 in versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5f92be046d0f..3376f1369951 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview-014770 + 3.1.200-preview-014935 From 83510efe1704291ccca2984315d7ec4effa8f3cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jan 2020 19:35:22 +0000 Subject: [PATCH 450/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6392 - NuGet.Build.Tasks - 5.5.0-preview.3.6392 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19565.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 3 +-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 215a1bc60f1d..9146eff86a19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,8 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdbddfb3b95f..a00ae246ebeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,13 +38,13 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + 427fa56aed34cbbc5096aa6137e748054905507d - + https://github.com/NuGet/NuGet.Client - cb402b5a3340ab5b2605ecc72de7f70aaac95344 + 31852f3254dd31c862798f99bd0639133b23fd03 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index effdce874bb4..e27f865a471f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 3.1.0-rtm.19605.7 + 3.1.0-rtm.19565.1 - 5.5.0-preview.2.6355 + 5.5.0-preview.3.6392 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3390c352b534aedd52d7d37affe61743d7169b9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 19:46:00 +0000 Subject: [PATCH 451/896] Update dependencies from https://github.com/dotnet/core-setup build 20200120.1 (#4128) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20070.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.2-servicing.20069.7 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 215a1bc60f1d..19d8873cebec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdbddfb3b95f..3113a1838004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index effdce874bb4..50226ff8233b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.0-rtm.19605.7 + 3.1.2-servicing.20069.7 @@ -78,7 +78,7 @@ 3.1.0 - 3.1.2-servicing.20064.3 + 3.1.2-servicing.20070.1 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 208eb4b6be8f81291a1a5e734c632f2ecc76db5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 20:05:31 +0000 Subject: [PATCH 452/896] Update dependencies from https://github.com/dotnet/templating build 20200114.1 (#13205) - Microsoft.TemplateEngine.Cli - 3.1.2-servicing.20064.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c19362f9c768..f6b37d1daefa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 4532450c0b28..75e5dbab9472 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.1-servicing.19605.2 + 3.1.2-servicing.20064.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From cd478822fd59f58b647b36829054c37e5792bac8 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 23 Jan 2020 12:09:10 -0800 Subject: [PATCH 453/896] Updating MSBuild dependency in Version.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3376f1369951..8bdfc522c057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ - 16.4.0 + 16.5.0-preview-20064-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 24995ff3023d0bb3c8866bef108c17760ffb042c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 20:09:58 +0000 Subject: [PATCH 454/896] Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1 (#13204) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6b37d1daefa..134826a6a065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc diff --git a/eng/Versions.props b/eng/Versions.props index 75e5dbab9472..492e3de2f782 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 3.1.0-rtm.19566.1 + 3.1.2-servicing.20068.1 From 8582445e03273a6c6ddfb0d9cecd66fa54e0ea41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 14:58:14 -0800 Subject: [PATCH 455/896] Update dependencies from https://github.com/aspnet/websdk build 20200122.3 (#4137) - Microsoft.NET.Sdk.Web - 3.1.200-preview.20072.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3113a1838004..34f8fe4ca360 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - ba45e562288bf3d82e6c0d7d573c922948cfa4d1 + 1cb4f5323a704f4b7f3ff26693d66075b8d6ba7f https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 50226ff8233b..6e8005062f1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.200-preview.20057.3 + 3.1.200-preview.20072.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From c1f0eb1126137a8ed7232236703599d9e902b8be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 23:04:58 +0000 Subject: [PATCH 456/896] [release/3.1.2xx] Update dependencies from dotnet/cli (#4126) * Update dependencies from https://github.com/dotnet/cli build 20200122.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20072.1 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.0-rtm.19565.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/cli build 20200123.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20073.1 * Update dependencies from https://github.com/dotnet/cli build 20200123.2 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20073.2 Co-authored-by: William Li --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6e8005062f1f..8c812bf39762 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20059.1 + 3.1.200-preview.20073.2 From ac69a3c1c50c8ed88a6d4f4cbe1347bfa5f1b5a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 23:22:59 +0000 Subject: [PATCH 457/896] Update dependencies from https://github.com/dotnet/sdk build 20200122.3 (#4138) - Microsoft.NET.Sdk - 3.1.200-preview.20072.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34f8fe4ca360..ee2334bbfba5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli cbf29e13514ba9d3be54eff7ccfe4b9df93e581b - + https://github.com/dotnet/sdk - b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 + 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8c812bf39762..255431938857 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20059.2 + 3.1.200-preview.20072.3 From 7b69381ad901d7d0a18875a90f4cae1c26634e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 23:13:17 +0000 Subject: [PATCH 458/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6392 (#13208) - NuGet.Build.Tasks - 5.5.0-preview.3.6392 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 134826a6a065..0a4879461f95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,9 +56,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - cb402b5a3340ab5b2605ecc72de7f70aaac95344 + 31852f3254dd31c862798f99bd0639133b23fd03 diff --git a/eng/Versions.props b/eng/Versions.props index 492e3de2f782..b88149bc4c53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ - 5.5.0-preview.2.6355 + 5.5.0-preview.3.6392 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 063988ceb6625cd504fdf8faf396ea536df7c2f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 23:45:10 +0000 Subject: [PATCH 459/896] [release/3.1.2xx] Update dependencies from Microsoft/msbuild (#4151) * Update dependencies from https://github.com/microsoft/msbuild build 20200124.2 - Microsoft.Build.Localization - 16.5.0-preview-20074-02 - Microsoft.Build - 16.5.0-preview-20074-02 * Update dependencies from https://github.com/microsoft/msbuild build 20200124.4 - Microsoft.Build.Localization - 16.5.0-preview-20074-04 - Microsoft.Build - 16.5.0-preview-20074-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee2334bbfba5..2665670cd53d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 86d9494e446de002ea6a4f08d6fbd111b1041059 + 0789c036a78547c28d02a6a27057b8de38df4506 - + https://github.com/microsoft/msbuild - 86d9494e446de002ea6a4f08d6fbd111b1041059 + 0789c036a78547c28d02a6a27057b8de38df4506 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 255431938857..706e71c4fd4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20064-06 + 16.5.0-preview-20074-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20064-06 + 16.5.0-preview-20074-04 $(MicrosoftBuildPackageVersion) From bd86d0c6ce7b041cc2ac3d77b5d104e5955ed3ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 23:55:49 +0000 Subject: [PATCH 460/896] Update dependencies from https://github.com/microsoft/msbuild build 20200124.3 (#4153) - Microsoft.Build.Localization - 16.5.0-preview-20074-03 - Microsoft.Build - 16.5.0-preview-20074-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2665670cd53d..e582d89448ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 0789c036a78547c28d02a6a27057b8de38df4506 + 424c584f33a1d393fc0c67fb9c17d4f5bd305304 - + https://github.com/microsoft/msbuild - 0789c036a78547c28d02a6a27057b8de38df4506 + 424c584f33a1d393fc0c67fb9c17d4f5bd305304 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 706e71c4fd4e..75f51326cb59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20074-04 + 16.5.0-preview-20074-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20074-04 + 16.5.0-preview-20074-03 $(MicrosoftBuildPackageVersion) From 6c1d85efce531503178dd42afde68fbb026432ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Jan 2020 00:41:03 +0000 Subject: [PATCH 461/896] [release/3.1.2xx] Update dependencies from dotnet/roslyn (#4135) * Update dependencies from https://github.com/dotnet/roslyn build 20200123.10 - Microsoft.Net.Compilers.Toolset - 3.5.0-beta2-20073-10 * Update dependencies from https://github.com/dotnet/roslyn build 20200124.5 - Microsoft.Net.Compilers.Toolset - 3.5.0-beta2-20074-05 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e582d89448ae..a47d552a4d8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp c4c09df4d5a68c3e9a51948bab554d11e2c141f2 - + https://github.com/dotnet/roslyn - d2bd58c62f9104d66f415141a1a27b665c78690c + c1a3db42197033d8af5e7ec76fce3461ef8f648d https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 75f51326cb59..5fc85098fd3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta1-19606-04 + 3.5.0-beta2-20074-05 From 0260ec44914f3b7e89c0d731331f814e94791817 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2020 20:19:39 +0000 Subject: [PATCH 462/896] Update dependencies from https://github.com/microsoft/msbuild build 20200124.8 (#4155) - Microsoft.Build.Localization - 16.5.0-preview-20074-08 - Microsoft.Build - 16.5.0-preview-20074-08 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a47d552a4d8d..f2d19db70823 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 424c584f33a1d393fc0c67fb9c17d4f5bd305304 + 7e5cc8493d6fa0d132fe8a0c24c0308016b53bb1 - + https://github.com/microsoft/msbuild - 424c584f33a1d393fc0c67fb9c17d4f5bd305304 + 7e5cc8493d6fa0d132fe8a0c24c0308016b53bb1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5fc85098fd3d..a6995951c803 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20074-03 + 16.5.0-preview-20074-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20074-03 + 16.5.0-preview-20074-08 $(MicrosoftBuildPackageVersion) From 5e72cb56eb0c0f570a8aeb624fb9c21e21332070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 20:20:56 +0000 Subject: [PATCH 463/896] Update dependencies from https://github.com/microsoft/msbuild build 20200128.5 (#4183) - Microsoft.Build.Localization - 16.5.0-preview-20078-05 - Microsoft.Build - 16.5.0-preview-20078-05 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2d19db70823..179cc29e203d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 7e5cc8493d6fa0d132fe8a0c24c0308016b53bb1 + da00ae3be87b1ce23ba261d5d4fb56fbd9afdfe1 - + https://github.com/microsoft/msbuild - 7e5cc8493d6fa0d132fe8a0c24c0308016b53bb1 + da00ae3be87b1ce23ba261d5d4fb56fbd9afdfe1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a6995951c803..d74bc4436a5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20074-08 + 16.5.0-preview-20078-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20074-08 + 16.5.0-preview-20078-05 $(MicrosoftBuildPackageVersion) From b02b6bc91dd9c0bdb57285687f46a3336749eae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 20:32:00 +0000 Subject: [PATCH 464/896] Update dependencies from https://github.com/microsoft/msbuild build 20200128.6 (#4185) - Microsoft.Build.Localization - 16.5.0-preview-20078-06 - Microsoft.Build - 16.5.0-preview-20078-06 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 179cc29e203d..5940019271e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - da00ae3be87b1ce23ba261d5d4fb56fbd9afdfe1 + 6b2b96f4a6cb17b75fe12b3f9ad0691421b3a2b3 - + https://github.com/microsoft/msbuild - da00ae3be87b1ce23ba261d5d4fb56fbd9afdfe1 + 6b2b96f4a6cb17b75fe12b3f9ad0691421b3a2b3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d74bc4436a5a..3b2fdf3e61e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20078-05 + 16.5.0-preview-20078-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20078-05 + 16.5.0-preview-20078-06 $(MicrosoftBuildPackageVersion) From 625601179951e1c0380193895d9febeb63489396 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 21:53:15 +0000 Subject: [PATCH 465/896] Update dependencies from https://github.com/microsoft/msbuild build 20200128.8 (#4186) - Microsoft.Build.Localization - 16.5.0-preview-20078-08 - Microsoft.Build - 16.5.0-preview-20078-08 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5940019271e9..efcb8969d9fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 6b2b96f4a6cb17b75fe12b3f9ad0691421b3a2b3 + 806df6dd8be269461ae2a0f4f9f8ee8baa493d5d - + https://github.com/microsoft/msbuild - 6b2b96f4a6cb17b75fe12b3f9ad0691421b3a2b3 + 806df6dd8be269461ae2a0f4f9f8ee8baa493d5d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3b2fdf3e61e1..7b98bd128f47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20078-06 + 16.5.0-preview-20078-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20078-06 + 16.5.0-preview-20078-08 $(MicrosoftBuildPackageVersion) From 70bc877b06e162b0a13443843658aadcc30c1a40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 23:26:39 +0000 Subject: [PATCH 466/896] Update dependencies from https://github.com/microsoft/msbuild build 20200129.1 (#4187) - Microsoft.Build.Localization - 16.5.0-preview-20079-01 - Microsoft.Build - 16.5.0-preview-20079-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efcb8969d9fe..70c4a2699350 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f - + https://github.com/microsoft/msbuild - 806df6dd8be269461ae2a0f4f9f8ee8baa493d5d + 2e5c73b3408843ac66ccca7ffd85bb6387387357 - + https://github.com/microsoft/msbuild - 806df6dd8be269461ae2a0f4f9f8ee8baa493d5d + 2e5c73b3408843ac66ccca7ffd85bb6387387357 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7b98bd128f47..7015c10da378 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20078-08 + 16.5.0-preview-20079-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20078-08 + 16.5.0-preview-20079-01 $(MicrosoftBuildPackageVersion) From db2fccb8bd407fca46f3f6057e0d27e03fdbe82b Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 30 Jan 2020 09:23:53 -0800 Subject: [PATCH 467/896] Update stage0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index c5e77fa2b41c..15cb6d39927d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.200-preview-014935", + "dotnet": "3.1.200-preview-014946", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From 0c18e0c93e85b8e95959c91b837e980e5f0d56ef Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 30 Jan 2020 09:29:51 -0800 Subject: [PATCH 468/896] Match stage0 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8bdfc522c057..69864dd49fca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview-014935 + 3.1.200-preview-014946 From 96d8d4f873c5e63e27f69e2f3807cfefc722b9bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 07:15:29 +0000 Subject: [PATCH 469/896] Update dependencies from https://github.com/dotnet/sdk build 20200130.4 (#4197) - Microsoft.NET.Sdk - 3.1.200-preview.20080.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33c37f16c556..8ce9d424ee34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli cbf29e13514ba9d3be54eff7ccfe4b9df93e581b - + https://github.com/dotnet/sdk - 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f + 1de5bc87ab0a42441ceb3044aa0c74185dcb888f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8a02fe905f78..d2bcf2e840d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20072.3 + 3.1.200-preview.20080.4 From 84e756adc02c1b6d35852b23abba04dda6d329e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 07:35:40 +0000 Subject: [PATCH 470/896] Update dependencies from https://github.com/dotnet/sdk build 20200130.4 (#13210) - Microsoft.NET.Sdk - 3.1.200-preview.20080.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31b63261f186..57648aef9933 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f + 1de5bc87ab0a42441ceb3044aa0c74185dcb888f https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 396ecc96798d..f7857bf11aef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 3.1.200-preview.20072.3 + 3.1.200-preview.20080.4 $(MicrosoftNETSdkPackageVersion) From 71c42ff72e6c80975429d35a37e0145b170c2ce3 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 31 Jan 2020 16:09:16 -0800 Subject: [PATCH 471/896] Revert to 3.1.1 runtimes (#4205) --- NuGet.config | 3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19d8873cebec..b9abe9e7f79f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ce9d424ee34..019d52559b65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e https://github.com/dotnet/cli @@ -33,14 +33,14 @@ https://github.com/dotnet/roslyn c1a3db42197033d8af5e7ec76fce3461ef8f648d - - https://github.com/dotnet/aspnetcore-tooling - 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 07f16c89db55ab6f9f773cc3db6eb5a52908065e - - https://github.com/dotnet/wpf - b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a8e48616c8d8e56469a456eb1ee263268316b827 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index d2bcf2e840d2..328f22c69f9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.2 + 3.1.1 @@ -48,7 +48,7 @@ - 3.1.2-servicing.20069.7 + 3.1.0-rtm.19605.7 @@ -78,8 +78,8 @@ 3.1.0 - 3.1.2-servicing.20070.1 - 3.1.2 + 3.1.1-servicing.19608.4 + 3.1.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 02b073f488cda2fef27a6ba0a4cd2e288273166c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 16:15:15 -0800 Subject: [PATCH 472/896] Update dependencies from https://github.com/aspnet/websdk build 20200131.2 (#4206) - Microsoft.NET.Sdk.Web - 3.1.200-preview.20081.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 019d52559b65..2864ce74660d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 1cb4f5323a704f4b7f3ff26693d66075b8d6ba7f + 072b4fc952d6f74f24bdd27e5c8ef1d87b467e51 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 328f22c69f9a..b425908c2e7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.200-preview.20072.3 + 3.1.200-preview.20081.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 96f648a89984f7f88b13a36eae069f76edc5516e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 3 Feb 2020 09:33:17 -0800 Subject: [PATCH 473/896] Revert to 3.1.1 runtime (#13211) * Revert to 3.1.1 runtime * undo bad versions.props changes --- NuGet.config | 4 +-- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++------- 3 files changed, 43 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36750d2c9f6a..e228c2b748b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57648aef9933..64ae9f042a5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,61 +1,49 @@ - + https://github.com/dotnet/templating - 247f60e9e34a03ed99e855eb1ea0c20931a968db + 13abe7e2749d95337e8d72efdc5b71611815fd43 - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/corefx - e946cebe43a510e8c6476bbc8185d1445df33a1a + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - - - - https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 - - - - https://github.com/dotnet/sdk + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 1de5bc87ab0a42441ceb3044aa0c74185dcb888f - - https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 - https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 @@ -64,5 +52,15 @@ https://github.com/NuGet/NuGet.Client 31852f3254dd31c862798f99bd0639133b23fd03 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e + + + + https://github.com/dotnet/arcade + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + + diff --git a/eng/Versions.props b/eng/Versions.props index f7857bf11aef..5b5697957bdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,21 +18,17 @@ 3.1.0 - 3.1.2 + 3.1.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20070.1 - 3.1.2 - 3.1.2 - 3.1.2 - 3.1.2 - - - - 4.7.1 + 3.1.1-servicing.19608.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 - 3.1.2-servicing.20068.1 + 3.1.1-servicing.19615.10 @@ -48,7 +44,7 @@ - 3.1.2-servicing.20064.1 + 3.1.1-servicing.19605.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 5d28dba08e74c3efe328410ed2c441a77a73805a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 21:19:12 +0000 Subject: [PATCH 474/896] [release/3.1.2xx] Update dependencies from dotnet/cli (#4198) * Update dependencies from https://github.com/dotnet/cli build 20200130.2 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20080.2 * Update dependencies from https://github.com/dotnet/cli build 20200203.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20103.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2864ce74660d..a518e7d45cd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - cbf29e13514ba9d3be54eff7ccfe4b9df93e581b + 96f648a89984f7f88b13a36eae069f76edc5516e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b425908c2e7e..7f58f6162bad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20073.2 + 3.1.200-preview.20103.1 From 9b0de6dd501f68753d32c602fb492be843ebf576 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 21:31:37 +0000 Subject: [PATCH 475/896] Update dependencies from https://github.com/microsoft/msbuild build 20200203.1 (#4217) - Microsoft.Build.Localization - 16.5.0-preview-20103-01 - Microsoft.Build - 16.5.0-preview-20103-01 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index b9abe9e7f79f..5dd38dab4785 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a518e7d45cd0..dfe039b26474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 1de5bc87ab0a42441ceb3044aa0c74185dcb888f - + https://github.com/microsoft/msbuild - 2e5c73b3408843ac66ccca7ffd85bb6387387357 + 7174ad213b45fed2169fb3d8bce35f5a453dccd1 - + https://github.com/microsoft/msbuild - 2e5c73b3408843ac66ccca7ffd85bb6387387357 + 7174ad213b45fed2169fb3d8bce35f5a453dccd1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7f58f6162bad..de1952ce2d03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20079-01 + 16.5.0-preview-20103-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20079-01 + 16.5.0-preview-20103-01 $(MicrosoftBuildPackageVersion) From 63fa4b8675ad19d82ccc1a93926af2e53a7cb3f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 11:13:06 -0800 Subject: [PATCH 476/896] Update dependencies from https://github.com/dotnet/sdk build 20200204.2 (#4222) - Microsoft.NET.Sdk - 3.1.200-preview.20104.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfe039b26474..0e246362b7ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 96f648a89984f7f88b13a36eae069f76edc5516e - + https://github.com/dotnet/sdk - 1de5bc87ab0a42441ceb3044aa0c74185dcb888f + c9f0a7673c300873f72b1d6f97048d1c17760884 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index de1952ce2d03..1f3a40ac1292 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20080.4 + 3.1.200-preview.20104.2 From f750ec6f22e514a4ba4378de772acf50a6dfbda5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 11:38:49 -0800 Subject: [PATCH 477/896] Update dependencies from https://github.com/dotnet/sdk build 20200204.2 (#13212) - Microsoft.NET.Sdk - 3.1.200-preview.20104.2 --- NuGet.config | 1 - eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index e228c2b748b3..283ad6849da4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64ae9f042a5a..5660c65d0218 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1de5bc87ab0a42441ceb3044aa0c74185dcb888f + + https://github.com/dotnet/sdk + c9f0a7673c300873f72b1d6f97048d1c17760884 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 5b5697957bdf..34667f81a506 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20080.4 + 3.1.200-preview.20104.2 $(MicrosoftNETSdkPackageVersion) From 46175b0e6dc423bb2019dd249d14a392eee1d518 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 19:55:09 +0000 Subject: [PATCH 478/896] Update dependencies from https://github.com/microsoft/msbuild build 20200204.1 (#4224) - Microsoft.Build.Localization - 16.5.0-preview-20104-01 - Microsoft.Build - 16.5.0-preview-20104-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e246362b7ff..7f913ff24ef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c9f0a7673c300873f72b1d6f97048d1c17760884 - + https://github.com/microsoft/msbuild - 7174ad213b45fed2169fb3d8bce35f5a453dccd1 + 3336ee7e5f96d87685c884e80842bedfd79d764c - + https://github.com/microsoft/msbuild - 7174ad213b45fed2169fb3d8bce35f5a453dccd1 + 3336ee7e5f96d87685c884e80842bedfd79d764c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1f3a40ac1292..6345e99bd69c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20103-01 + 16.5.0-preview-20104-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20103-01 + 16.5.0-preview-20104-01 $(MicrosoftBuildPackageVersion) From eba47836cf1c67363c1e62b55d5a30d3fc4a685d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 21:31:04 +0000 Subject: [PATCH 479/896] Update dependencies from https://github.com/dotnet/sdk build 20200204.3 (#4225) - Microsoft.NET.Sdk - 3.1.200-preview.20104.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f913ff24ef7..7d7395c914c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 96f648a89984f7f88b13a36eae069f76edc5516e - + https://github.com/dotnet/sdk - c9f0a7673c300873f72b1d6f97048d1c17760884 + 20950a8fe1eb06b181f08c778acc5bd4df9719db https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6345e99bd69c..a4dfea75342d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20104.2 + 3.1.200-preview.20104.3 From 1fdbf3c21818378a8331e7d6c3bc5d3e6c82ee94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 21:56:19 +0000 Subject: [PATCH 480/896] Update dependencies from https://github.com/dotnet/sdk build 20200204.3 (#13213) - Microsoft.NET.Sdk - 3.1.200-preview.20104.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5660c65d0218..1fb691244dcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - c9f0a7673c300873f72b1d6f97048d1c17760884 + 20950a8fe1eb06b181f08c778acc5bd4df9719db https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 34667f81a506..518b92fcba89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20104.2 + 3.1.200-preview.20104.3 $(MicrosoftNETSdkPackageVersion) From 142d3200a0a731bdf1d873714a3ed594d35fe740 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:04:34 +0000 Subject: [PATCH 481/896] Update dependencies from https://github.com/microsoft/msbuild build 20200204.2 (#4226) - Microsoft.Build.Localization - 16.5.0-preview-20104-02 - Microsoft.Build - 16.5.0-preview-20104-02 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d7395c914c0..b8d3cc5ee977 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 20950a8fe1eb06b181f08c778acc5bd4df9719db - + https://github.com/microsoft/msbuild - 3336ee7e5f96d87685c884e80842bedfd79d764c + 4a70ce8c4c3f5ed82bd0c0bd7aafc0568c403fe5 - + https://github.com/microsoft/msbuild - 3336ee7e5f96d87685c884e80842bedfd79d764c + 4a70ce8c4c3f5ed82bd0c0bd7aafc0568c403fe5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a4dfea75342d..8b9687b0c045 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20104-01 + 16.5.0-preview-20104-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20104-01 + 16.5.0-preview-20104-02 $(MicrosoftBuildPackageVersion) From 869c8d132b4f1914e45a2e278d06ab9ff23f2540 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:28:17 +0000 Subject: [PATCH 482/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6412 (#4227) - NuGet.Build.Tasks - 5.5.0-rtm.6412 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8d3cc5ee977..8d3c48a53bad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a8e48616c8d8e56469a456eb1ee263268316b827 - + https://github.com/NuGet/NuGet.Client - 31852f3254dd31c862798f99bd0639133b23fd03 + 86f0ae460b9086bd79e4c9bc53650f700a09e4b7 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8b9687b0c045..7cd71d22b776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-preview.3.6392 + 5.5.0-rtm.6412 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 281d35c146aa7d13787629ef42c931ce41563c9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:18:04 +0000 Subject: [PATCH 483/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6412 (#13214) - NuGet.Build.Tasks - 5.5.0-rtm.6412 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fb691244dcc..c4daec155f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 31852f3254dd31c862798f99bd0639133b23fd03 + 86f0ae460b9086bd79e4c9bc53650f700a09e4b7 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 518b92fcba89..2417e4a6d686 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.5.0-preview.3.6392 + 5.5.0-rtm.6412 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3bcd6b4a94078a80b195e360fdbc7f1bd7490b23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:30:53 +0000 Subject: [PATCH 484/896] Update dependencies from https://github.com/dotnet/cli build 20200204.2 (#4229) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20104.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d3c48a53bad..7494f880d3f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 96f648a89984f7f88b13a36eae069f76edc5516e + 1fdbf3c21818378a8331e7d6c3bc5d3e6c82ee94 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7cd71d22b776..907e71af7724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20103.1 + 3.1.200-preview.20104.2 From e1054742a1364bef99a2f7bd907a41da82741da4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:46:01 +0000 Subject: [PATCH 485/896] Update dependencies from https://github.com/microsoft/msbuild build 20200204.3 (#4231) - Microsoft.Build.Localization - 16.5.0-preview-20104-03 - Microsoft.Build - 16.5.0-preview-20104-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7494f880d3f5..1e4fce90ffa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 20950a8fe1eb06b181f08c778acc5bd4df9719db - + https://github.com/microsoft/msbuild - 4a70ce8c4c3f5ed82bd0c0bd7aafc0568c403fe5 + 700b0783df2d8f7e1f2d70bf645675fdc59324a0 - + https://github.com/microsoft/msbuild - 4a70ce8c4c3f5ed82bd0c0bd7aafc0568c403fe5 + 700b0783df2d8f7e1f2d70bf645675fdc59324a0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 907e71af7724..0d3fcd0b7d7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20104-02 + 16.5.0-preview-20104-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20104-02 + 16.5.0-preview-20104-03 $(MicrosoftBuildPackageVersion) From e12a1e5bb6a2d9ecfdc5a32eeb2a183f44b31578 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:57:02 +0000 Subject: [PATCH 486/896] Update dependencies from https://github.com/microsoft/msbuild build 20200204.4 (#4232) - Microsoft.Build.Localization - 16.5.0-preview-20104-04 - Microsoft.Build - 16.5.0-preview-20104-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e4fce90ffa8..6a3976daf55f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 20950a8fe1eb06b181f08c778acc5bd4df9719db - + https://github.com/microsoft/msbuild - 700b0783df2d8f7e1f2d70bf645675fdc59324a0 + 5115b126fe2ff66d2b957d8195e51348278e63a1 - + https://github.com/microsoft/msbuild - 700b0783df2d8f7e1f2d70bf645675fdc59324a0 + 5115b126fe2ff66d2b957d8195e51348278e63a1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d3fcd0b7d7e..498ef0540a7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20104-03 + 16.5.0-preview-20104-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20104-03 + 16.5.0-preview-20104-04 $(MicrosoftBuildPackageVersion) From a5124d2f3e85d7fdd77fd6621745ccf53b43b19d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2020 01:26:29 +0000 Subject: [PATCH 487/896] Update dependencies from https://github.com/dotnet/fsharp build 20200204.8 (#4234) - Microsoft.FSharp.Compiler - 10.8.0-beta.20104.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a3976daf55f..422bdf566c03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 5115b126fe2ff66d2b957d8195e51348278e63a1 - + https://github.com/dotnet/fsharp - c4c09df4d5a68c3e9a51948bab554d11e2c141f2 + 7c4de19faf36647c1ef700e655a52350840c6f03 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 498ef0540a7a..7cd284ed5e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20071.14 + 10.8.0-beta.20104.8 From 4d52f6a5fb82689582bbd23dace7b1eb3279daa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2020 01:36:08 +0000 Subject: [PATCH 488/896] Update dependencies from https://github.com/dotnet/cli build 20200204.3 (#4233) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20104.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 422bdf566c03..e52cda0175b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 1fdbf3c21818378a8331e7d6c3bc5d3e6c82ee94 + 281d35c146aa7d13787629ef42c931ce41563c9f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7cd284ed5e98..dda167004e7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20104.2 + 3.1.200-preview.20104.3 From 809e67ae50bc30454e38070e1312ed0fb71add01 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Wed, 5 Feb 2020 14:11:52 +0100 Subject: [PATCH 489/896] Update version of test plaform to 16.5.0 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dda167004e7c..73c386598d3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ - 16.3.0 + 16.5.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 93cb20a09eff99e0925a697b8b017e0faf8da336 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 01:26:27 +0000 Subject: [PATCH 490/896] Update dependencies from https://github.com/dotnet/sdk build 20200205.2 (#4242) - Microsoft.NET.Sdk - 3.1.200-preview.20105.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e52cda0175b6..d76237c1eab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 281d35c146aa7d13787629ef42c931ce41563c9f - + https://github.com/dotnet/sdk - 20950a8fe1eb06b181f08c778acc5bd4df9719db + f8d14891f5440e79d0449d357beb4cceede34382 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index dda167004e7c..14ddc1ffa250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20104.3 + 3.1.200-preview.20105.2 From 79c5e648b8cc0d891cee296d8141e35c421d8862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 01:41:37 +0000 Subject: [PATCH 491/896] Update dependencies from https://github.com/dotnet/sdk build 20200205.2 (#13216) - Microsoft.NET.Sdk - 3.1.200-preview.20105.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4daec155f92..5b619c6a6e18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - 20950a8fe1eb06b181f08c778acc5bd4df9719db + f8d14891f5440e79d0449d357beb4cceede34382 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2417e4a6d686..aefb7331dbba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20104.3 + 3.1.200-preview.20105.2 $(MicrosoftNETSdkPackageVersion) From 9f2331464d36e4f0fe1119420e6ccda250e3e138 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 02:15:10 +0000 Subject: [PATCH 492/896] [release/3.1.2xx] Update dependencies from dotnet/roslyn (#4223) * Update dependencies from https://github.com/dotnet/roslyn build 20200204.2 - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20104-02 * Update dependencies from https://github.com/dotnet/roslyn build 20200206.2 - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20106-02 * netcoreapp2.1 -> netcoreapp3.1 Co-authored-by: William Godbe --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d76237c1eab1..2b93b69a61b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - c1a3db42197033d8af5e7ec76fce3461ef8f648d + bda5cd0598de948831f1fb28ab1d30b368fe2001 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 14ddc1ffa250..d8249f4a81fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta2-20074-05 + 3.5.0-beta3-20106-02 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index a57c64402ee2..ffc019e28377 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -13,7 +13,7 @@ $(OutputPath)/Roslyn - + From 79967b4a51df5a10a2a3557b196b4b3cfdba7cae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 04:05:43 +0000 Subject: [PATCH 493/896] Update dependencies from https://github.com/dotnet/cli build 20200205.2 (#4245) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20105.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b93b69a61b8..08c5ddb91e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 281d35c146aa7d13787629ef42c931ce41563c9f + 79c5e648b8cc0d891cee296d8141e35c421d8862 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d8249f4a81fd..4823af4993c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20104.3 + 3.1.200-preview.20105.2 From 0a1ae224d37398feb56c298abdce7f2319c00c7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Feb 2020 21:27:56 +0000 Subject: [PATCH 494/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6418 - NuGet.Build.Tasks - 5.5.0-rtm.6418 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08c5ddb91e08..5f0f4d06fdd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a8e48616c8d8e56469a456eb1ee263268316b827 - + https://github.com/NuGet/NuGet.Client - 86f0ae460b9086bd79e4c9bc53650f700a09e4b7 + a746cd6a01dfd22187375ee9c5a0d9b98676020a https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 4823af4993c2..eb1fc824f8db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-rtm.6412 + 5.5.0-rtm.6418 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 23c35d6b67871559796fe76c712c5bdf3ffaedb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 22:15:47 +0000 Subject: [PATCH 495/896] Update dependencies from https://github.com/dotnet/sdk build 20200206.1 (#4249) - Microsoft.NET.Sdk - 3.1.200-preview.20106.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08c5ddb91e08..55196107e079 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 79c5e648b8cc0d891cee296d8141e35c421d8862 - + https://github.com/dotnet/sdk - f8d14891f5440e79d0449d357beb4cceede34382 + 261e44a129f73bec98adf6eb3b45556f121316e8 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4823af4993c2..69ac7c306b09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20105.2 + 3.1.200-preview.20106.1 From 95c6f4707539a133185c90d80d2e69846b220e91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Feb 2020 22:33:29 +0000 Subject: [PATCH 496/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6422 - NuGet.Build.Tasks - 5.5.0-rtm.6422 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f0f4d06fdd8..bcc9852c00f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a8e48616c8d8e56469a456eb1ee263268316b827 - + https://github.com/NuGet/NuGet.Client - a746cd6a01dfd22187375ee9c5a0d9b98676020a + 7bac015acc5b7e0161a058c8febc98abe2386d51 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index eb1fc824f8db..95de74e554f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-rtm.6418 + 5.5.0-rtm.6422 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 9438e797dca79e3a867b3a6cd8450632f3aa6e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2020 22:58:11 +0000 Subject: [PATCH 497/896] [release/3.1.2xx] Update dependencies from nuget/nuget.client (#13218) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6418 - NuGet.Build.Tasks - 5.5.0-rtm.6418 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6422 - NuGet.Build.Tasks - 5.5.0-rtm.6422 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b619c6a6e18..6b4937d330d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 86f0ae460b9086bd79e4c9bc53650f700a09e4b7 + 7bac015acc5b7e0161a058c8febc98abe2386d51 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup diff --git a/eng/Versions.props b/eng/Versions.props index aefb7331dbba..f0cb594d6c4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.5.0-rtm.6412 + 5.5.0-rtm.6422 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 159a3acb72fd3cd9dae5605caa5d922f4df3708d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Feb 2020 23:45:34 +0000 Subject: [PATCH 498/896] Update dependencies from https://github.com/dotnet/cli build 20200207.1 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20107.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5185a3104e68..792973bc84a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 79c5e648b8cc0d891cee296d8141e35c421d8862 + 9438e797dca79e3a867b3a6cd8450632f3aa6e71 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 850f3ad7f7c4..7a5063622e09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20105.2 + 3.1.200-preview.20107.1 From a5f564c82ee7c4c371d9f3b6513d8f7b437fe8f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 8 Feb 2020 00:09:40 +0000 Subject: [PATCH 499/896] Update dependencies from https://github.com/dotnet/sdk build 20200206.2 (#4250) - Microsoft.NET.Sdk - 3.1.200-preview.20106.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5185a3104e68..4048d9e4b9be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 79c5e648b8cc0d891cee296d8141e35c421d8862 - + https://github.com/dotnet/sdk - 261e44a129f73bec98adf6eb3b45556f121316e8 + 1951672f0cdf3ab6a9841781bdf17b3619ca2755 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 850f3ad7f7c4..92431202fd95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20106.1 + 3.1.200-preview.20106.2 From ce7027083cc440b7d9715b5d3ea73ac3f2069c22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 8 Feb 2020 02:12:37 +0000 Subject: [PATCH 500/896] [release/3.1.2xx] Update dependencies from dotnet/sdk (#13219) * Update dependencies from https://github.com/dotnet/sdk build 20200206.1 - Microsoft.NET.Sdk - 3.1.200-preview.20106.1 * Update dependencies from https://github.com/dotnet/sdk build 20200206.2 - Microsoft.NET.Sdk - 3.1.200-preview.20106.2 * Update dependencies from https://github.com/dotnet/sdk build 20200207.4 - Microsoft.NET.Sdk - 3.1.200-preview.20107.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b4937d330d2..8a58c16f48a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - f8d14891f5440e79d0449d357beb4cceede34382 + 130be5a782f6fa8410627a8fddd3e2988bde1c71 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f0cb594d6c4e..893d9e4932c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20105.2 + 3.1.200-preview.20107.4 $(MicrosoftNETSdkPackageVersion) From 16c85788f281257012b3cc2194d6c19e5e443286 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Feb 2020 03:00:35 +0000 Subject: [PATCH 501/896] Update dependencies from https://github.com/dotnet/cli build 20200207.2 - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20107.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 792973bc84a6..58ce63a0ccf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 9438e797dca79e3a867b3a6cd8450632f3aa6e71 + ce7027083cc440b7d9715b5d3ea73ac3f2069c22 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7a5063622e09..864c395174a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20107.1 + 3.1.200-preview.20107.2 From a7fbf14f2ab40b8ade6b44025e6b34e0b1910930 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2020 05:16:21 +0000 Subject: [PATCH 502/896] Update dependencies from https://github.com/dotnet/sdk build 20200207.4 (#4257) - Microsoft.NET.Sdk - 3.1.200-preview.20107.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4048d9e4b9be..dbc8fae3aabb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 79c5e648b8cc0d891cee296d8141e35c421d8862 - + https://github.com/dotnet/sdk - 1951672f0cdf3ab6a9841781bdf17b3619ca2755 + 130be5a782f6fa8410627a8fddd3e2988bde1c71 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 92431202fd95..1851425fbdc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20106.2 + 3.1.200-preview.20107.4 From 10b58218b32345dd2daac5aff6b7d2b5e72312e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2020 06:21:26 +0000 Subject: [PATCH 503/896] Update dependencies from https://github.com/dotnet/roslyn build 20200208.4 (#4264) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20108-04 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f4b4c52b49..838df4312b8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - bda5cd0598de948831f1fb28ab1d30b368fe2001 + 2e50b268fd1312514af07330641941d2969257f1 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 60903164e628..75e33f98dba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20106-02 + 3.5.0-beta3-20108-04 From 6ad9111885d0b3b74bad8adc6e10a08d63c4963a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 00:06:42 +0000 Subject: [PATCH 504/896] Update dependencies from https://github.com/dotnet/roslyn build 20200210.3 (#4266) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20110-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 838df4312b8f..881187037982 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - 2e50b268fd1312514af07330641941d2969257f1 + b32446a3abee9653bcb2c63eda694373722af5b8 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 75e33f98dba6..f1d93bcbee64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20108-04 + 3.5.0-beta3-20110-03 From 93b15f339409b2fbf7978cd41b9f5e375d7defb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 03:35:20 +0000 Subject: [PATCH 505/896] Update dependencies from https://github.com/dotnet/roslyn build 20200211.3 (#4272) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20111-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 881187037982..f4dd1e93cf29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - b32446a3abee9653bcb2c63eda694373722af5b8 + 0d99ae64c2e26215231f69414747af8773a28eab https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index f1d93bcbee64..bbbffe322d69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20110-03 + 3.5.0-beta3-20111-03 From 308b971f7ffe6ea66420ef52c4b1d5560822b2a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 02:58:22 +0000 Subject: [PATCH 506/896] Update dependencies from https://github.com/dotnet/roslyn build 20200213.1 (#4275) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20113-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4dd1e93cf29..0597e1864180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - 0d99ae64c2e26215231f69414747af8773a28eab + 36f07b2fe2943f53be6b7a77404f5503631c2423 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index bbbffe322d69..d8299a8ad560 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20111-03 + 3.5.0-beta3-20113-01 From c408596a0c8ee062e7b008eb0daa36c32489a5bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 05:47:00 +0000 Subject: [PATCH 507/896] Update dependencies from https://github.com/dotnet/roslyn build 20200213.3 (#4276) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20113-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0597e1864180..fb36f684fb3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - 36f07b2fe2943f53be6b7a77404f5503631c2423 + 7a561292191670de17997b02e4729494ba4bf9fc https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index d8299a8ad560..eddb82b1bc08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20113-01 + 3.5.0-beta3-20113-03 From a1c6678066e7ad854eea0a877ea7fddc3895f44d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 18:44:59 +0000 Subject: [PATCH 508/896] Update dependencies from https://github.com/microsoft/msbuild build 20200213.3 (#4278) - Microsoft.Build.Localization - 16.5.0-preview-20113-03 - Microsoft.Build - 16.5.0-preview-20113-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb36f684fb3d..c0b8b9cf283a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 130be5a782f6fa8410627a8fddd3e2988bde1c71 - + https://github.com/microsoft/msbuild - 5115b126fe2ff66d2b957d8195e51348278e63a1 + 04ed36359bd2db86f10b3394bcaa5a99208afc97 - + https://github.com/microsoft/msbuild - 5115b126fe2ff66d2b957d8195e51348278e63a1 + 04ed36359bd2db86f10b3394bcaa5a99208afc97 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index eddb82b1bc08..689a3089fd34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20104-04 + 16.5.0-preview-20113-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20104-04 + 16.5.0-preview-20113-03 $(MicrosoftBuildPackageVersion) From 300e921afd3c03455c1ad6abe289d67d5d932971 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 00:21:12 +0000 Subject: [PATCH 509/896] Update dependencies from https://github.com/dotnet/arcade build 20200213.5 (#4281) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 2 +- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ global.json | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0b8b9cf283a..a045da194503 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 46d175fdfdca..b94c2f4e411d 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) { Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 } InstallDarcCli $darcVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b121d77e07d1..3c69186f03a7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -341,4 +341,28 @@ stages: channelId: 557 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: 759 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: 760 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 6749add3fbde..9a1e57884873 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" } } From 6bd49230cf41bf1c263e5b0b60da4ced63316837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 00:32:29 +0000 Subject: [PATCH 510/896] Update dependencies from https://github.com/dotnet/arcade build 20200213.5 (#13222) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 2 +- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ global.json | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a58c16f48a3..dfc0c4070231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,9 +58,9 @@ - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 46d175fdfdca..b94c2f4e411d 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) { Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 } InstallDarcCli $darcVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b121d77e07d1..3c69186f03a7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -341,4 +341,28 @@ stages: channelId: 557 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: 759 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: 760 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 15cb6d39927d..75b19fcabe8e 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" } } From 3ab06e3a80dfdb3c8d6d1a1c1499743bb185391e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 01:30:43 +0000 Subject: [PATCH 511/896] Update dependencies from https://github.com/aspnet/websdk build 20200213.3 (#4284) - Microsoft.NET.Sdk.Web - 3.1.200-preview.20113.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a045da194503..5f4c8e22b6cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 072b4fc952d6f74f24bdd27e5c8ef1d87b467e51 + 7b076183e29b441375628f6a9d72424330f1c5ee https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 689a3089fd34..59fd4bd6b19f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.200-preview.20081.2 + 3.1.200-preview.20113.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 0bf3abac96f2282400d0f3dd872d1b00fd32c4aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 01:55:47 +0000 Subject: [PATCH 512/896] Update dependencies from https://github.com/dotnet/cli build 20200213.3 (#4285) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20113.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f4c8e22b6cf..f98be18e51a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - ce7027083cc440b7d9715b5d3ea73ac3f2069c22 + 6bd49230cf41bf1c263e5b0b60da4ced63316837 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 59fd4bd6b19f..7a5a04e194fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20107.2 + 3.1.200-preview.20113.3 From 6d1cb63c295b911c4774464ed2919a565f960547 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 03:17:47 +0000 Subject: [PATCH 513/896] Update dependencies from https://github.com/dotnet/roslyn build 20200214.1 (#4286) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20114-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f98be18e51a2..a3d4e601aad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - 7a561292191670de17997b02e4729494ba4bf9fc + 5c18b7e10bf4761c8d8ecd463123ab06cfaccd8e https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 7a5a04e194fa..7021624ca97e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20113-03 + 3.5.0-beta3-20114-01 From fffc9b08d4b940615addef48af2c47f725d6f534 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 03:25:44 +0000 Subject: [PATCH 514/896] Update dependencies from https://github.com/dotnet/sdk build 20200213.2 (#4287) - Microsoft.NET.Sdk - 3.1.200-preview.20113.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3d4e601aad2..1ef180a1d7cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 6bd49230cf41bf1c263e5b0b60da4ced63316837 - + https://github.com/dotnet/sdk - 130be5a782f6fa8410627a8fddd3e2988bde1c71 + 0bc67530cef6dd771a8750d1747926eca2dcb845 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 7021624ca97e..5f79132bb4c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20107.4 + 3.1.200-preview.20113.2 From 0c08f73cd1ce63143cd6b78c34524d5f2a5474eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 04:51:24 +0000 Subject: [PATCH 515/896] Update dependencies from https://github.com/dotnet/roslyn build 20200214.2 (#4290) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20114-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef180a1d7cb..1b8d2351c569 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 7c4de19faf36647c1ef700e655a52350840c6f03 - + https://github.com/dotnet/roslyn - 5c18b7e10bf4761c8d8ecd463123ab06cfaccd8e + 92790e24cc2b9f9e336ed0365d610e106c01df88 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 5f79132bb4c8..3415b146e0a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20114-01 + 3.5.0-beta3-20114-02 From e67c4a6cfcf1c7dc3cafd40427024fb8495f2333 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 08:20:43 +0000 Subject: [PATCH 516/896] Update dependencies from https://github.com/dotnet/fsharp build 20200213.9 (#4291) - Microsoft.FSharp.Compiler - 10.8.0-beta.20113.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8d2351c569..ae6848f88cae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 04ed36359bd2db86f10b3394bcaa5a99208afc97 - + https://github.com/dotnet/fsharp - 7c4de19faf36647c1ef700e655a52350840c6f03 + 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 3415b146e0a7..f65b683b2d42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20104.8 + 10.8.0-beta.20113.9 From acc38406fbcfeeaa172f511cdb9e630d4fae1046 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Sun, 12 Feb 2017 16:48:06 +0100 Subject: [PATCH 517/896] read default language for `dotnet new` from env var `DOTNET_NEW_PREFERRED_LANG` --- .../commands/dotnet-new/NewCommandShim.cs | 5 ++- .../dotnet-new.Tests/GivenThatIWantANewApp.cs | 44 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs index 99a9c9612836..a82678e7e34c 100644 --- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs +++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs @@ -63,9 +63,12 @@ private static ITemplateEngineHost CreateHost() typeof(NupkgUpdater).GetTypeInfo().Assembly }); + string preferredLangEnvVar = Environment.GetEnvironmentVariable("DOTNET_NEW_PREFERRED_LANG"); + string preferredLang = string.IsNullOrWhiteSpace(preferredLangEnvVar)? "C#" : preferredLangEnvVar; + var preferences = new Dictionary { - { "prefs:language", "C#" }, + { "prefs:language", preferredLang }, { "dotnet-cli-version", Product.Version }, { "RuntimeFrameworkVersion", new Muxer().SharedFxVersion }, { "NetStandardImplicitPackageVersion", new FrameworkDependencyFile().GetNetStandardLibraryVersion() }, diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 07554275f969..a1cca379db50 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -35,5 +35,49 @@ public void When_dotnet_new_is_invoked_multiple_times_it_should_fail() result.Should().Fail(); } + + [Fact] + public void When_dotnet_new_is_invoked_with_preferred_lang_env_var_set() + { + var rootPath = TestAssets.CreateTestDirectory().FullName; + + new NewCommand() + .WithWorkingDirectory(rootPath) + .WithEnvironmentVariable("DOTNET_NEW_PREFERRED_LANG", "F#") + .Execute($"console --debug:ephemeral-hive --no-restore -n f1") + .Should().Pass(); + + string expectedFsprojPath = Path.Combine(rootPath, "f1", "f1.fsproj"); + Assert.True(File.Exists(expectedFsprojPath), $"expected '{expectedFsprojPath}' but was not found"); + } + + [Fact] + public void When_dotnet_new_is_invoked_default_is_csharp() + { + var rootPath = TestAssets.CreateTestDirectory().FullName; + + new NewCommand() + .WithWorkingDirectory(rootPath) + .Execute($"console --debug:ephemeral-hive --no-restore -n c1") + .Should().Pass(); + + string expectedCsprojPath = Path.Combine(rootPath, "c1", "c1.csproj"); + Assert.True(File.Exists(expectedCsprojPath), $"expected '{expectedCsprojPath}' but was not found"); + } + + [Fact] + public void When_dotnet_new_is_invoked_with_preferred_lang_env_var_empty() + { + var rootPath = TestAssets.CreateTestDirectory().FullName; + + new NewCommand() + .WithWorkingDirectory(rootPath) + .WithEnvironmentVariable("DOTNET_NEW_PREFERRED_LANG", "") + .Execute($"console --debug:ephemeral-hive --no-restore -n c1") + .Should().Pass(); + + string expectedCsprojPath = Path.Combine(rootPath, "c1", "c1.csproj"); + Assert.True(File.Exists(expectedCsprojPath), $"expected '{expectedCsprojPath}' but was not found"); + } } } From 003454db824f0bd58d0b7a967e42f11f20692a48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2020 18:32:39 +0000 Subject: [PATCH 518/896] Update dependencies from https://github.com/dotnet/sdk build 20200213.2 (#13226) - Microsoft.NET.Sdk - 3.1.200-preview.20113.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfc0c4070231..6543f9eb0d9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/sdk - 130be5a782f6fa8410627a8fddd3e2988bde1c71 + 0bc67530cef6dd771a8750d1747926eca2dcb845 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 893d9e4932c0..28e9b0204242 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20107.4 + 3.1.200-preview.20113.2 $(MicrosoftNETSdkPackageVersion) From 0431c8677d3933fdfbd62946dbdd31294787a11a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2020 19:45:46 +0000 Subject: [PATCH 519/896] Update dependencies from https://github.com/dotnet/cli build 20200218.2 (#4313) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20118.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae6848f88cae..e2ffa1173466 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup a1388f194c30cb21b36b75982962cb5e35954e4e - + https://github.com/dotnet/cli - 6bd49230cf41bf1c263e5b0b60da4ced63316837 + 003454db824f0bd58d0b7a967e42f11f20692a48 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f65b683b2d42..947474104910 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20113.3 + 3.1.200-preview.20118.2 From e8dfcaf6d27640aea0af2ee4623f9a5e3c9cd407 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2020 04:39:28 +0000 Subject: [PATCH 520/896] Update dependencies from https://github.com/dotnet/roslyn build 20200219.2 (#4324) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20119-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2ffa1173466..3cd784f376e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - 92790e24cc2b9f9e336ed0365d610e106c01df88 + fdeac238b502eb9a810a287311c7b2040f9c3b4e https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 947474104910..0447741eb22d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20114-02 + 3.5.0-beta3-20119-02 From 91a81b97d95d1f21a4aea28b2c9f3c9afd14189a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2020 21:44:59 +0000 Subject: [PATCH 521/896] Update dependencies from https://github.com/dotnet/roslyn build 20200220.11 (#4341) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta3-20120-11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cd784f376e2..5720d5a0d958 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - fdeac238b502eb9a810a287311c7b2040f9c3b4e + e86c462a4b68616762c091e7152c16119da9ca21 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 0447741eb22d..0ceb4e793142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20119-02 + 3.5.0-beta3-20120-11 From cd9c3f289e3ee83ef4a419b670316eb9862b4e8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2020 03:21:23 +0000 Subject: [PATCH 522/896] Update dependencies from https://github.com/dotnet/roslyn build 20200221.2 (#4347) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20121-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5720d5a0d958..cc9b703ccc65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - e86c462a4b68616762c091e7152c16119da9ca21 + 00d6c9265709c3d161ade2ebd55a48557115fb41 https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 0ceb4e793142..c7eecc183cc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta3-20120-11 + 3.5.0-beta4-20121-02 From 91a8ae0212e8272ada0a805f0f4b5e48deb2e44a Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 20 Feb 2020 21:31:58 -0800 Subject: [PATCH 523/896] Update to 3.1.2 runtimes --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc9b703ccc65..ca4d8bf3b163 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/cli @@ -33,14 +33,14 @@ https://github.com/dotnet/roslyn 00d6c9265709c3d161ade2ebd55a48557115fb41 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index c7eecc183cc8..cd645e9c03d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.1 + 3.1.2 @@ -48,7 +48,7 @@ - 3.1.0-rtm.19605.7 + 3.1.2-servicing.20069.7 @@ -78,8 +78,8 @@ 3.1.0 - 3.1.1-servicing.19608.4 - 3.1.1 + 3.1.2-servicing.20070.1 + 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 7e55add69e878f1222cc01fc74ca833d3ee0777c Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 11:24:00 -0800 Subject: [PATCH 524/896] Align with v3.1.102 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca4d8bf3b163..32d7f5554331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,7 +5,7 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb @@ -38,7 +38,7 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - + https://github.com/dotnet/wpf b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 diff --git a/eng/Versions.props b/eng/Versions.props index cd645e9c03d8..a81b33c1a827 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.2-servicing.20069.7 + 3.1.2-servicing.20066.4 @@ -78,7 +78,7 @@ 3.1.0 - 3.1.2-servicing.20070.1 + 3.1.2-servicing.20067.4 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 4ffd4960d49cc291e4ec57be24f739a49da6007b Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 13:56:45 -0800 Subject: [PATCH 525/896] darc update-dependencies --- NuGet.config | 2 ++ eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dd38dab4785..19d8873cebec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,9 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32d7f5554331..8f0f6fd77c76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,7 +38,7 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - + https://github.com/dotnet/wpf b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 diff --git a/eng/Versions.props b/eng/Versions.props index a81b33c1a827..95caeb05f647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.2-servicing.20066.4 + 3.1.2-servicing.20069.7 From e9ddda34457a1bf2d92483db14110c01bdf34233 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 14:31:35 -0800 Subject: [PATCH 526/896] Revert "Revert to 3.1.1 runtime (#13211)" This reverts commit 96f648a89984f7f88b13a36eae069f76edc5516e. --- NuGet.config | 3 +- eng/Version.Details.xml | 66 +++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++----- 3 files changed, 48 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 283ad6849da4..36750d2c9f6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6543f9eb0d9e..2e129c55f54a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,61 @@ - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + e946cebe43a510e8c6476bbc8185d1445df33a1a - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + + + https://github.com/dotnet/arcade + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + + + https://github.com/dotnet/sdk 0bc67530cef6dd771a8750d1747926eca2dcb845 + + https://github.com/dotnet/core-setup + 76cc488b8c942815d8b4bfe1de803b916667fe37 + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 @@ -52,15 +64,5 @@ https://github.com/NuGet/NuGet.Client 7bac015acc5b7e0161a058c8febc98abe2386d51 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e - - - - https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad - - diff --git a/eng/Versions.props b/eng/Versions.props index 28e9b0204242..4e2b62398c03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,17 +18,21 @@ 3.1.0 - 3.1.1 + 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.1-servicing.19608.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 + 3.1.2-servicing.20070.1 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + + + + 4.7.1 - 3.1.1-servicing.19615.10 + 3.1.2-servicing.20068.1 @@ -44,7 +48,7 @@ - 3.1.1-servicing.19605.2 + 3.1.2-servicing.20064.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 3c54ca2aebc51bf44d6271f9cd69af4ecb1c54d8 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 14:49:52 -0800 Subject: [PATCH 527/896] Align with v3.1.102 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e129c55f54a..61ecab158bca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,7 +52,7 @@ https://github.com/dotnet/sdk 0bc67530cef6dd771a8750d1747926eca2dcb845 - + https://github.com/dotnet/core-setup 76cc488b8c942815d8b4bfe1de803b916667fe37 diff --git a/eng/Versions.props b/eng/Versions.props index 4e2b62398c03..0b49285cb21a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 3.1.0 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20070.1 + 3.1.2-servicing.20067.4 3.1.2 3.1.2 3.1.2 From 628ec234917072da3e040ceae4dc7a3d28e87611 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 14:53:47 -0800 Subject: [PATCH 528/896] Remove extra change --- eng/Versions.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0b49285cb21a..dea2b55ad1b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,10 +26,6 @@ 3.1.2 3.1.2 - - - 4.7.1 - 3.1.2-servicing.20068.1 From b18238b0ed0a3e3dfaa6bd412ae97178021cda78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2020 01:00:30 +0000 Subject: [PATCH 529/896] Update dependencies from https://github.com/aspnet/websdk build 20200221.4 (#4360) - Microsoft.NET.Sdk.Web - 3.1.200-preview.20121.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f0f6fd77c76..0e5227729e4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 7b076183e29b441375628f6a9d72424330f1c5ee + c358064252d565527f659fa239e59c1b3b99934f https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 95caeb05f647..16c54a9f00b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.200-preview.20113.3 + 3.1.200-preview.20121.4 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 6683e564cf62f57f876e1740214b901a41f362e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2020 20:40:29 +0000 Subject: [PATCH 530/896] Update dependencies from https://github.com/dotnet/cli build 20200223.1 (#4361) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20123.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e5227729e4a..a2f7c1808d8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - 003454db824f0bd58d0b7a967e42f11f20692a48 + 2b200dd9108f4907120f55281ce549878023b2c1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 16c54a9f00b4..d4602d1c03d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20118.2 + 3.1.200-preview.20123.1 From f1ae79d83d0c08d08472e9f7ba030a119c4d9458 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 23 Feb 2020 21:15:28 -0800 Subject: [PATCH 531/896] update to 3.1.2 runtime (#10699) * Align runtime with v3.1.102 * Update stage0 * Update global.json --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf996506a72f..5ee67f7b3c54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ https://github.com/dotnet/arcade 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index a98b8c6b0aec..79b8e02890f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 15.4.8 15.4.8 2.1.0-preview2-26306-03 - 3.1.1 + 3.1.2 2.0.1-servicing-26011-01 9.0.1 5.5.0-rtm.6422 diff --git a/global.json b/global.json index c384417a6048..57066fc90b1f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.200-preview-014967", + "dotnet": "3.1.200-preview-014999", "vs-opt": { "version": "15.9" } From 76acb0d0dbd3cd045c1a6fd1da00de24e35fba5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 06:55:29 +0000 Subject: [PATCH 532/896] Update dependencies from https://github.com/dotnet/sdk build 20200223.1 (#4362) - Microsoft.NET.Sdk - 3.1.200-preview.20123.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2f7c1808d8c..3c503241d05e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 2b200dd9108f4907120f55281ce549878023b2c1 - + https://github.com/dotnet/sdk - 0bc67530cef6dd771a8750d1747926eca2dcb845 + f1ae79d83d0c08d08472e9f7ba030a119c4d9458 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d4602d1c03d9..9700472f8da1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20113.2 + 3.1.200-preview.20123.1 From 80e7d33f08fbc8042d1cb8fdb01ec72667e5d662 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:56:03 +0000 Subject: [PATCH 533/896] Update dependencies from https://github.com/microsoft/msbuild build 20200224.3 (#4363) - Microsoft.Build.Localization - 16.5.0-preview-20124-03 - Microsoft.Build - 16.5.0 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19d8873cebec..6e438b2d08cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c503241d05e..da99f21d3623 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk f1ae79d83d0c08d08472e9f7ba030a119c4d9458 - + https://github.com/microsoft/msbuild - 04ed36359bd2db86f10b3394bcaa5a99208afc97 + d4cbfca49cea3b14c8b3cc0bbd6cb2a6d55ff3d9 - + https://github.com/microsoft/msbuild - 04ed36359bd2db86f10b3394bcaa5a99208afc97 + d4cbfca49cea3b14c8b3cc0bbd6cb2a6d55ff3d9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9700472f8da1..e2460b519837 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0-preview-20113-03 + 16.5.0 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20113-03 + 16.5.0-preview-20124-03 $(MicrosoftBuildPackageVersion) From 5e2596aefb5f470eb9fed18868736265fdab2511 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:01:38 +0000 Subject: [PATCH 534/896] Update dependencies from https://github.com/dotnet/sdk build 20200223.1 (#13264) - Microsoft.NET.Sdk - 3.1.200-preview.20123.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61ecab158bca..20cfbed26a34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 0bc67530cef6dd771a8750d1747926eca2dcb845 + f1ae79d83d0c08d08472e9f7ba030a119c4d9458 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index dea2b55ad1b0..d500c8435390 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20113.2 + 3.1.200-preview.20123.1 $(MicrosoftNETSdkPackageVersion) From 99c019d308d25855c67b83eb3ca94f9fd5999bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:55:29 +0000 Subject: [PATCH 535/896] Update dependencies from https://github.com/dotnet/cli build 20200224.1 (#4364) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20124.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da99f21d3623..a2bea04c4b04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - 2b200dd9108f4907120f55281ce549878023b2c1 + 5e2596aefb5f470eb9fed18868736265fdab2511 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e2460b519837..b589a92565b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20123.1 + 3.1.200-preview.20124.1 From bd496937bc708b187671cf333e3fa69f000c3b93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2020 02:18:27 +0000 Subject: [PATCH 536/896] Update dependencies from https://github.com/dotnet/roslyn build 20200225.1 (#4365) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20125-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2bea04c4b04..23097244c9a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - 00d6c9265709c3d161ade2ebd55a48557115fb41 + bb0c62e4cb0d56c2a232c52452faba55269f86b5 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index b589a92565b9..76449f2927ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20121-02 + 3.5.0-beta4-20125-01 From ea44f257c21c77525f15bd49d5eb87a1b4cc280b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2020 05:43:56 +0000 Subject: [PATCH 537/896] Update dependencies from https://github.com/dotnet/roslyn build 20200225.4 (#4366) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20125-04 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23097244c9a5..fb2e4adac4dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - bb0c62e4cb0d56c2a232c52452faba55269f86b5 + 1baa0b3063238ed752ad1f0368b1df6b6901373e https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 76449f2927ce..219adc853640 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20125-01 + 3.5.0-beta4-20125-04 From 84817352e86c3bbb1155819050befb4a1bea5c6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2020 23:48:24 +0000 Subject: [PATCH 538/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6473 (#4367) - NuGet.Build.Tasks - 5.5.0-rtm.6473 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2e4adac4dd..5cc4f903a93a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 - + https://github.com/NuGet/NuGet.Client - 7bac015acc5b7e0161a058c8febc98abe2386d51 + 4ba7bfa82f894ec32a554ca8d2df143675c85735 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 219adc853640..2cd81f8709dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-rtm.6422 + 5.5.0-rtm.6473 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 1a75f83011dccb47a8b9689704b961a0bf09ca14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 00:48:34 +0000 Subject: [PATCH 539/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6473 (#10722) - NuGet.Build.Tasks - 5.5.0-rtm.6473 --- NuGet.config | 3 +++ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6674d25eece5..9b43cf88a8a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee67f7b3c54..c4a852c9e9d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 7bac015acc5b7e0161a058c8febc98abe2386d51 + 4ba7bfa82f894ec32a554ca8d2df143675c85735 diff --git a/eng/Versions.props b/eng/Versions.props index 79b8e02890f8..716e1fea08fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.5.0-rtm.6422 + 5.5.0-rtm.6473 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From 011bceaeaaa68279aebf84ce58e488a1acaf283a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 03:10:30 +0000 Subject: [PATCH 540/896] Update dependencies from https://github.com/dotnet/sdk build 20200226.2 (#4368) - Microsoft.NET.Sdk - 3.1.200-preview.20126.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cc4f903a93a..b51c639a03cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 5e2596aefb5f470eb9fed18868736265fdab2511 - + https://github.com/dotnet/sdk - f1ae79d83d0c08d08472e9f7ba030a119c4d9458 + 1a75f83011dccb47a8b9689704b961a0bf09ca14 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 2cd81f8709dd..7c2588601328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20123.1 + 3.1.200-preview.20126.2 From 44640862dc6c545ea60c748c6a321913fbf2bdcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 03:30:39 +0000 Subject: [PATCH 541/896] Update dependencies from https://github.com/dotnet/sdk build 20200226.2 (#13266) - Microsoft.NET.Sdk - 3.1.200-preview.20126.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20cfbed26a34..c58aa73f8688 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - f1ae79d83d0c08d08472e9f7ba030a119c4d9458 + 1a75f83011dccb47a8b9689704b961a0bf09ca14 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index d500c8435390..cac0789c7a2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20123.1 + 3.1.200-preview.20126.2 $(MicrosoftNETSdkPackageVersion) From a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 05:05:44 +0000 Subject: [PATCH 542/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.5.0.6473 (#13265) - NuGet.Build.Tasks - 5.5.0-rtm.6473 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c58aa73f8688..220806c1b357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 7bac015acc5b7e0161a058c8febc98abe2386d51 + 4ba7bfa82f894ec32a554ca8d2df143675c85735 diff --git a/eng/Versions.props b/eng/Versions.props index cac0789c7a2a..a8c58e31cdee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.5.0-rtm.6422 + 5.5.0-rtm.6473 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 845309e160dcca7868312942f6618955b14cfac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 05:15:28 +0000 Subject: [PATCH 543/896] Update dependencies from https://github.com/dotnet/cli build 20200226.1 (#4369) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20126.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b51c639a03cf..3332ab83e368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - 5e2596aefb5f470eb9fed18868736265fdab2511 + 44640862dc6c545ea60c748c6a321913fbf2bdcb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7c2588601328..7a232e626240 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20124.1 + 3.1.200-preview.20126.1 From 88cdbcb087141623b35c112ab3c97dca25e6c8be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 07:05:30 +0000 Subject: [PATCH 544/896] Update dependencies from https://github.com/dotnet/cli build 20200226.2 (#4370) - Microsoft.DotNet.Cli.Runtime - 3.1.200-preview.20126.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3332ab83e368..2fb0df9afc65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - 44640862dc6c545ea60c748c6a321913fbf2bdcb + a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7a232e626240..759badefcee9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20126.1 + 3.1.200-preview.20126.2 From 7848af4b784658523b15ae605a3a14c4bba5dea4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 03:15:32 +0000 Subject: [PATCH 545/896] Update dependencies from https://github.com/dotnet/roslyn build 20200228.1 (#4372) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20128-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fb0df9afc65..e0a7ff38aa84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - 1baa0b3063238ed752ad1f0368b1df6b6901373e + c59debd7a94d135fd96728b7992a5bf841fe9a99 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 759badefcee9..a13f9d9f59ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20125-04 + 3.5.0-beta4-20128-01 From 1b8cb74582270813dacddbe5ef89c3d55aa2ecbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 23:21:26 +0000 Subject: [PATCH 546/896] Update dependencies from https://github.com/dotnet/roslyn build 20200228.3 (#4377) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20128-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0a7ff38aa84..97880e8c2fe7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - c59debd7a94d135fd96728b7992a5bf841fe9a99 + 8f010124a3a323b34f561d062025258668d91539 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index a13f9d9f59ac..02ad6be64a7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20128-01 + 3.5.0-beta4-20128-03 From 820400bd23e930ac7816c26fc085c1945977a240 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 23:26:33 +0000 Subject: [PATCH 547/896] Update dependencies from https://github.com/dotnet/roslyn build 20200228.3 (#4377) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20128-03 From 73f0352d1cc739ce20019e5b059dc3b4e1bf767d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 00:52:55 +0000 Subject: [PATCH 548/896] Update dependencies from https://github.com/dotnet/roslyn build 20200302.17 (#4387) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20152-17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97880e8c2fe7..c12e4341382d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn - 8f010124a3a323b34f561d062025258668d91539 + 20b9af913f1b8ce0a62f72bea9e75e4aa3cf6b0e https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 02ad6be64a7f..b899f401ffbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20128-03 + 3.5.0-beta4-20152-17 From b5160ead2f6b91d45b89edb3c29747f0a8e60a26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:59:25 +0000 Subject: [PATCH 549/896] Update dependencies from https://github.com/dotnet/roslyn build 20200303.5 (#4388) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta4-20153-05 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c12e4341382d..a1e75aedca83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,7 +29,7 @@ https://github.com/dotnet/fsharp 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 - + https://github.com/dotnet/roslyn 20b9af913f1b8ce0a62f72bea9e75e4aa3cf6b0e diff --git a/eng/Versions.props b/eng/Versions.props index b899f401ffbd..4391188a158b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20152-17 + 3.5.0-beta4-20153-05 From fc8a920afc14ace3af1f145e81b1dac29b6e15a5 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 6 Mar 2020 14:23:32 -0800 Subject: [PATCH 550/896] Update branding --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 716e1fea08fc..1d7e76325df9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,8 +6,8 @@ - 3.1.200 - preview + 3.1.300 + preview1 From b9a190623f0f4cbad399e2421dc12ac4a6d676cd Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 6 Mar 2020 14:26:51 -0800 Subject: [PATCH 551/896] Update branding to preview --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1d7e76325df9..eef26fe96085 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 3.1.300 - preview1 + preview From 5904f0ab6c3e610dc7e418b86cbfd8c3b0aeabaf Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 6 Mar 2020 14:30:33 -0800 Subject: [PATCH 552/896] Update branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a8c58e31cdee..7b49ef74353a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.200 + 3.1.300 preview From a8f9e0768e70efb460c8206a60d7b1b0bdceb134 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 6 Mar 2020 14:37:28 -0800 Subject: [PATCH 553/896] Update branding 3.1.300 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4391188a158b..38d28513793c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.200 + 3.1.300 preview From a41c9135e5e23440e106930c7ce949ded2ab3d26 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 4 Mar 2020 13:21:49 -0800 Subject: [PATCH 554/896] Adding DOTNET_NOLOGO flag for first run experience --- .../DotnetFirstRunConfiguration.cs | 7 +++- .../DotnetFirstTimeUseConfigurer.cs | 12 ++++-- src/dotnet/Program.cs | 5 ++- .../GivenADotnetFirstTimeUseConfigurer.cs | 27 +++++++++----- ...netFirstTimeUseConfigurerWIthStateSetup.cs | 37 +++++++++++++------ 5 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstRunConfiguration.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstRunConfiguration.cs index f45b6adf6a4e..0e621828db4c 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstRunConfiguration.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstRunConfiguration.cs @@ -8,16 +8,21 @@ public class DotnetFirstRunConfiguration public bool GenerateAspNetCertificate { get; } public bool TelemetryOptout { get; } + public bool AddGlobalToolsToPath { get; } + public bool NoLogo { get; } + public DotnetFirstRunConfiguration( bool generateAspNetCertificate, bool telemetryOptout, - bool addGlobalToolsToPath) + bool addGlobalToolsToPath, + bool nologo) { GenerateAspNetCertificate = generateAspNetCertificate; TelemetryOptout = telemetryOptout; AddGlobalToolsToPath = addGlobalToolsToPath; + NoLogo = nologo; } } } diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index c299d57de994..bfa1b09d455b 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -50,13 +50,17 @@ public void Configure() if (ShouldPrintFirstTimeUseNotice()) { - PrintFirstTimeMessageWelcome(); - if (ShouldPrintTelemetryMessageWhenFirstTimeUseNoticeIsEnabled()) + if (!_dotnetFirstRunConfiguration.NoLogo) { - PrintTelemetryMessage(); + PrintFirstTimeMessageWelcome(); + if (ShouldPrintTelemetryMessageWhenFirstTimeUseNoticeIsEnabled()) + { + PrintTelemetryMessage(); + } + + PrintFirstTimeMessageMoreInformation(); } - PrintFirstTimeMessageMoreInformation(); _firstTimeUseNoticeSentinel.CreateIfNotExists(); } diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 8b9cccfe0b9a..46d44d800e29 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -150,6 +150,8 @@ internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false); bool addGlobalToolsToPath = environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true); + bool nologo = + environmentProvider.GetEnvironmentVariableAsBool("DOTNET_NOLOGO", defaultValue: false); ReportDotnetHomeUsage(environmentProvider); @@ -166,7 +168,8 @@ internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null var dotnetFirstRunConfiguration = new DotnetFirstRunConfiguration( generateAspNetCertificate: generateAspNetCertificate, telemetryOptout: telemetryOptout, - addGlobalToolsToPath: addGlobalToolsToPath); + addGlobalToolsToPath: addGlobalToolsToPath, + nologo: nologo); ConfigureDotNetForFirstTimeUse( firstTimeUseNoticeSentinel, diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs index 3a945ae354df..0091a47addb6 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -46,7 +46,8 @@ public void It_does_not_print_the_first_time_use_notice_if_the_sentinel_exists() ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -72,7 +73,8 @@ public void It_prints_the_telemetry_if_the_sentinel_does_not_exist() ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -98,7 +100,8 @@ public void It_adds_the_tool_path_to_the_environment_if_the_tool_path_sentinel_d ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -124,7 +127,8 @@ public void It_does_not_add_the_tool_path_to_the_environment_if_the_tool_path_se ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -150,7 +154,8 @@ public void It_does_not_generate_the_aspnet_https_development_certificate_if_the ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -175,7 +180,8 @@ public void It_does_not_generate_the_aspnet_https_development_certificate_when_t ( generateAspNetCertificate: false, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -200,7 +206,8 @@ public void It_generates_the_aspnet_https_development_certificate_if_the_sentine ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -224,7 +231,8 @@ public void It_adds_the_tool_path_to_the_environment_if_addGlobalToolsToPath_is_ ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: true + addGlobalToolsToPath: true, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, @@ -247,7 +255,8 @@ public void It_does_not_add_the_tool_path_to_the_environment_if_addGlobalToolsTo ( generateAspNetCertificate: true, telemetryOptout: false, - addGlobalToolsToPath: false + addGlobalToolsToPath: false, + nologo: false ), _reporterMock.Object, CliFallbackFolderPath, diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs index 8ef54887af8a..104ca3ca7397 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurerWIthStateSetup.cs @@ -47,18 +47,27 @@ private void ResetObjectState() } [Theory] - [InlineData(false, false, false, Never, FirstRun, FirstRun, true, true)] - [InlineData(true, false, false, FirstRun, FirstRun, FirstRun, true, true)] - [InlineData(false, true, false, Never, FirstRun, Never, false, false)] - [InlineData(true, true, false, FirstRun, FirstRun, Never, false, false)] - [InlineData(false, false, true, Never, SecondRun, SecondRun, true, true)] - [InlineData(true, false, true, SecondRun, SecondRun, SecondRun, true, true)] - [InlineData(false, true, true, Never, SecondRun, Never, false, false)] - [InlineData(true, true, true, SecondRun, SecondRun, Never, false, false)] + [InlineData(false, false, false, false, Never, FirstRun, FirstRun, true, true)] + [InlineData(true, false, false, false, FirstRun, FirstRun, FirstRun, true, true)] + [InlineData(false, true, false, false, Never, FirstRun, Never, false, false)] + [InlineData(true, true, false, false, FirstRun, FirstRun, Never, false, false)] + [InlineData(false, false, true, false, Never, Never, Never, true, true)] + [InlineData(true, false, true, false, FirstRun, Never, Never, true, true)] + [InlineData(false, true, true, false, Never, Never, Never, false, false)] + [InlineData(true, true, true, false, FirstRun, Never, Never, false, false)] + [InlineData(false, false, false, true, Never, SecondRun, SecondRun, true, true)] + [InlineData(true, false, false, true, SecondRun, SecondRun, SecondRun, true, true)] + [InlineData(false, true, false, true, Never, SecondRun, Never, false, false)] + [InlineData(true, true, false, true, SecondRun, SecondRun, Never, false, false)] + [InlineData(false, false, true, true, Never, Never, Never, true, true)] + [InlineData(true, false, true, true, SecondRun, Never, Never, true, true)] + [InlineData(false, true, true, true, Never, Never, Never, false, false)] + [InlineData(true, true, true, true, SecondRun, Never, Never, false, false)] public void FlagsCombinationAndAction( // Inputs bool DOTNET_GENERATE_ASPNET_CERTIFICATE, bool DOTNET_CLI_TELEMETRY_OPTOUT, + bool DOTNET_NOLOGO, // true to simulate install via installer. The first run is during installer, // silent but has sudo permission // false to simulate install via zip/tar.gz @@ -74,11 +83,14 @@ bool telemetrySecondRunShouldBeEnabled ResetObjectState(); _environmentProvider - .Setup(p => p.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", It.IsAny())) - .Returns(DOTNET_GENERATE_ASPNET_CERTIFICATE); + .Setup(p => p.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", It.IsAny())) + .Returns(DOTNET_GENERATE_ASPNET_CERTIFICATE); _environmentProvider .Setup(p => p.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", It.IsAny())) .Returns(DOTNET_CLI_TELEMETRY_OPTOUT); + _environmentProvider + .Setup(p => p.GetEnvironmentVariableAsBool("DOTNET_NOLOGO", It.IsAny())) + .Returns(DOTNET_NOLOGO); _environmentProvider .Setup(p => p.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", It.IsAny())) .Returns(true); @@ -205,6 +217,8 @@ private Telemetry RunConfigUsingMocks(bool isInstallerRun) _environmentProviderObject.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", false); bool addGlobalToolsToPath = _environmentProviderObject.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true); + bool nologo = + _environmentProviderObject.GetEnvironmentVariableAsBool("DOTNET_NOLOGO", defaultValue: false); IAspNetCertificateSentinel aspNetCertificateSentinel; IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel; @@ -232,7 +246,8 @@ private Telemetry RunConfigUsingMocks(bool isInstallerRun) ( generateAspNetCertificate: generateAspNetCertificate, telemetryOptout: telemetryOptout, - addGlobalToolsToPath: addGlobalToolsToPath + addGlobalToolsToPath: addGlobalToolsToPath, + nologo: nologo ), reporter: _reporterMock, cliFallbackFolderPath: CliFallbackFolderPath, From 74b6cb39036b54bf3f0fac90c00eac8b9aa4b0df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 22:05:28 +0000 Subject: [PATCH 555/896] Update dependencies from https://github.com/aspnet/websdk build 20200310.4 (#4395) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20160.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1e75aedca83..ce2c9c94d397 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - c358064252d565527f659fa239e59c1b3b99934f + a6bf9c21d24e8063e2b8e0e8dfc9aaadc98dd206 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 38d28513793c..13a55b59380d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.200-preview.20121.4 + 3.1.300-servicing.20160.4 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From a360dd6ff2012a97ff9b10d431adc84334302ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 10 Mar 2020 15:49:14 -0700 Subject: [PATCH 556/896] Order GenerateAssemblyInfo target before BeforeCompile (#10613) (#10616) --- .../targets/Microsoft.NET.GenerateAssemblyInfo.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets index 56ded98711c6..501c620b32ea 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets @@ -42,9 +42,12 @@ Copyright (c) .NET Foundation. All rights reserved. where CoreCompile is invoked without other potential hooks such as Compile or CoreBuild, etc., so we hook directly on to CoreCompile. Furthermore, we must run *after* PrepareForBuild to ensure that the intermediate directory has been created. + + Targets that generate Compile items are also expected to run before + BeforeCompile targets (common targets convention). --> From 61592b48dd24bed5c5603b308ce41ba77f3ac3a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 00:40:28 +0000 Subject: [PATCH 557/896] Update dependencies from https://github.com/dotnet/sdk build 20200310.11 (#4398) - Microsoft.NET.Sdk - 3.1.300-preview.20160.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2c9c94d397..560838da8f06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a - + https://github.com/dotnet/sdk - 1a75f83011dccb47a8b9689704b961a0bf09ca14 + a360dd6ff2012a97ff9b10d431adc84334302ef4 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 13a55b59380d..1827d1ad76ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.200-preview.20126.2 + 3.1.300-preview.20160.11 From ea551c5daaed5a1c783a8e8942dfaad42c3beb07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 17:45:35 +0000 Subject: [PATCH 558/896] Update dependencies from https://github.com/dotnet/cli build 20200311.1 (#4399) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20161.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 560838da8f06..d0a06ad4f2bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a + cbe09077cf66fb84bb56bfe483321e34e3af8a2e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1827d1ad76ee..215537ede219 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview.20126.2 + 3.1.300-preview.20161.1 From c2694dfc2d625c22643680d516ed684ae0eab1d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 19:53:19 +0000 Subject: [PATCH 559/896] Update dependencies from https://github.com/microsoft/msbuild build 20200312.3 (#4401) - Microsoft.Build.Localization - 16.6.0-preview-20162-03 - Microsoft.Build - 16.6.0-preview-20162-03 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 -- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e438b2d08cc..4478523483b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0a06ad4f2bb..fe61eb201456 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk a360dd6ff2012a97ff9b10d431adc84334302ef4 - + https://github.com/microsoft/msbuild - d4cbfca49cea3b14c8b3cc0bbd6cb2a6d55ff3d9 + 00781ad1353afba25451148dba61845ac139b572 - + https://github.com/microsoft/msbuild - d4cbfca49cea3b14c8b3cc0bbd6cb2a6d55ff3d9 + 00781ad1353afba25451148dba61845ac139b572 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 215537ede219..e4ec4d61de6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.5.0 + 16.6.0-preview-20162-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.5.0-preview-20124-03 + 16.6.0-preview-20162-03 $(MicrosoftBuildPackageVersion) From ca8852c1f0fe8f550cf39af562ebb64f7a51c38e Mon Sep 17 00:00:00 2001 From: Andy Zivkovic Date: Thu, 12 Mar 2020 13:23:48 -0700 Subject: [PATCH 560/896] Update NuGet to version 5.6.0.6489 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe61eb201456..ee1e83594744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 - + https://github.com/NuGet/NuGet.Client - 4ba7bfa82f894ec32a554ca8d2df143675c85735 + 5433d816f748d4ad78b75fc320397d8117f57771 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e4ec4d61de6e..a768c40bd09e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.5.0-rtm.6473 + 5.6.0-preview.2.6489 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 328752e331ffc560fea8c8509629c95ac6554f18 Mon Sep 17 00:00:00 2001 From: Andy Zivkovic Date: Thu, 12 Mar 2020 13:28:17 -0700 Subject: [PATCH 561/896] Update NuGet to version 5.6.0.6489 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220806c1b357..613a6b90c56a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 4ba7bfa82f894ec32a554ca8d2df143675c85735 + 5433d816f748d4ad78b75fc320397d8117f57771 diff --git a/eng/Versions.props b/eng/Versions.props index 7b49ef74353a..901cf6f7cec5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.5.0-rtm.6473 + 5.6.0-preview.2.6489 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From a922532e3d3fd4f25661aa2352e46459302fb6b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 23:20:04 +0000 Subject: [PATCH 562/896] Update dependencies from https://github.com/dotnet/sdk build 20200310.11 (#13278) - Microsoft.NET.Sdk - 3.1.300-preview.20160.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220806c1b357..685e072472be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 1a75f83011dccb47a8b9689704b961a0bf09ca14 + a360dd6ff2012a97ff9b10d431adc84334302ef4 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 7b49ef74353a..78f03a24a9f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.200-preview.20126.2 + 3.1.300-preview.20160.11 $(MicrosoftNETSdkPackageVersion) From 9e5af358872b0bb9b3beea117c6c7eaa6fc49570 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 00:55:36 +0000 Subject: [PATCH 563/896] Update dependencies from https://github.com/dotnet/cli build 20200312.2 (#4404) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20162.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee1e83594744..580f76580823 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - cbe09077cf66fb84bb56bfe483321e34e3af8a2e + a922532e3d3fd4f25661aa2352e46459302fb6b2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a768c40bd09e..ae8cb29d529c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20161.1 + 3.1.300-preview.20162.2 From 96cca5c436a1fc43236599e109facaf66a0b792b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 05:05:29 +0000 Subject: [PATCH 564/896] Update dependencies from https://github.com/dotnet/cli build 20200312.4 (#4406) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20162.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 580f76580823..fe6f59d44c69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/cli - a922532e3d3fd4f25661aa2352e46459302fb6b2 + 75111456fd9f891ef11011cbb2ca03e7a18ab92e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ae8cb29d529c..a94417ba9d44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20162.2 + 3.1.300-preview.20162.4 From 58f5b3e221d93de5037c45c759be58307c33b0ff Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Mar 2020 10:34:06 -0700 Subject: [PATCH 565/896] Update to 3.1.2 dependencies --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36750d2c9f6a..422b319cc6e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80b329658016..143a048db3c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,23 +7,23 @@ https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 @@ -54,7 +54,7 @@ https://github.com/dotnet/core-setup - 76cc488b8c942815d8b4bfe1de803b916667fe37 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/CliCommandLineParser From c080f1cd1dd51eae8c34c42f017de306547d6b2f Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Mar 2020 10:47:20 -0700 Subject: [PATCH 566/896] Update to nuget build used in cli/toolset --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4a852c9e9d5..1eb31e4c47c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 4ba7bfa82f894ec32a554ca8d2df143675c85735 + 5433d816f748d4ad78b75fc320397d8117f57771 diff --git a/eng/Versions.props b/eng/Versions.props index eef26fe96085..93ea8433cd6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.5.0-rtm.6473 + 5.6.0-preview.2.6489 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From 1a0a7a3dc88fa951612c80d0e7068066e5bcf7dc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Mar 2020 11:16:12 -0700 Subject: [PATCH 567/896] Update to 3.1.2 dependencies (#4407) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4478523483b5..501b40803f3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe6f59d44c69..babd66736f24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - + https://github.com/dotnet/wpf - b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 + 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index a94417ba9d44..6572a4a4c472 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.2-servicing.20069.7 + 3.1.2-servicing.20066.4 From 27fe8d245dd064b60aa6043f5fb86141e3972813 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 17:37:28 +0000 Subject: [PATCH 568/896] Update dependencies from https://github.com/aspnet/websdk build 20200313.2 (#4408) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20163.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index babd66736f24..a5437edf41a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - a6bf9c21d24e8063e2b8e0e8dfc9aaadc98dd206 + 9385873eaf845bb0565d61a579633840d5a9d377 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6572a4a4c472..d5d707decf7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20160.4 + 3.1.300-servicing.20163.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From c44f0a9678d7b560f9153d4b65effd01fd51d00c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 18:25:29 +0000 Subject: [PATCH 569/896] Update dependencies from https://github.com/dotnet/cli build 20200317.1 (#4411) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20167.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5437edf41a5..0014967026a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 75111456fd9f891ef11011cbb2ca03e7a18ab92e + cb807aab514ead2650bb8b1caef5be607410dba7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d5d707decf7d..aa02a03a3891 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20162.4 + 3.1.300-preview.20167.1 From 74b849149b19bf580d740d004f9005530e789f77 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Tue, 17 Mar 2020 12:55:24 -0700 Subject: [PATCH 570/896] Updating stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 57066fc90b1f..0fb58e0eae26 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.200-preview-014999", + "dotnet": "3.1.300-preview-015039", "vs-opt": { "version": "15.9" } From 42d88017258abe4143e187af59bc96f7948c337e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 00:00:30 +0000 Subject: [PATCH 571/896] Update dependencies from https://github.com/dotnet/sdk build 20200317.4 (#4414) - Microsoft.NET.Sdk - 3.1.300-preview.20167.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0014967026a3..9d1c3e2afa1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli cb807aab514ead2650bb8b1caef5be607410dba7 - + https://github.com/dotnet/sdk - a360dd6ff2012a97ff9b10d431adc84334302ef4 + ab67b97f347912176cbc9f94ab76c5645d245af6 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index aa02a03a3891..4ceb5bf4734f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20160.11 + 3.1.300-preview.20167.4 From b234867cb3322666b420a7be8fc89c4196d19b3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 16:02:10 +0000 Subject: [PATCH 572/896] Update dependencies from https://github.com/dotnet/sdk build 20200317.4 (#13286) - Microsoft.NET.Sdk - 3.1.300-preview.20167.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 143a048db3c0..d0f60c8e05b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - a360dd6ff2012a97ff9b10d431adc84334302ef4 + ab67b97f347912176cbc9f94ab76c5645d245af6 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 29608ecf06a8..cedaf274c505 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20160.11 + 3.1.300-preview.20167.4 $(MicrosoftNETSdkPackageVersion) From 34cf9198546024cbd28c04dc8295dd88a1d43e95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 17:40:36 +0000 Subject: [PATCH 573/896] Update dependencies from https://github.com/dotnet/cli build 20200318.1 (#4415) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20168.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d1c3e2afa1e..9adfee3e30e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - cb807aab514ead2650bb8b1caef5be607410dba7 + b234867cb3322666b420a7be8fc89c4196d19b3e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4ceb5bf4734f..0df00d6d8cfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20167.1 + 3.1.300-preview.20168.1 From cdaec7751419fdcd907130b5964f58eaa9ca06b4 Mon Sep 17 00:00:00 2001 From: Luke Westendorf Date: Wed, 18 Mar 2020 15:40:56 -0700 Subject: [PATCH 574/896] Updating ComputeFilesCopiedToPublishDir to work during design time builds --- .../targets/Microsoft.NET.Publish.targets | 35 ++++---- .../PublishItemsOutputGroupTests.cs | 81 ++++++++++++++----- 2 files changed, 79 insertions(+), 37 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index 6c2ee51a44f1..7251e0592e19 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -139,13 +139,6 @@ Copyright (c) .NET Foundation. All rights reserved. Inputs="@(_ResolvedFileToPublishPreserveNewest)" Outputs="@(_ResolvedFileToPublishPreserveNewest->'$(PublishDir)%(RelativePath)')"> - - <_ResolvedUnbundledFileToPublishPreserveNewest - Include="@(_ResolvedFileToPublishPreserveNewest)" - Condition="'$(PublishSingleFile)' != 'true' or - '%(_ResolvedFileToPublishPreserveNewest.ExcludeFromSingleFile)'=='true'" /> - - @@ -369,6 +356,19 @@ Copyright (c) .NET Foundation. All rights reserved. <_ResolvedFileToPublishAlways Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.CopyToPublishDirectory)'=='Always'" /> + + + + <_ResolvedUnbundledFileToPublishPreserveNewest + Include="@(_ResolvedFileToPublishPreserveNewest)" + Condition="'$(PublishSingleFile)' != 'true' or + '%(_ResolvedFileToPublishPreserveNewest.ExcludeFromSingleFile)'=='true'" /> + + <_ResolvedUnbundledFileToPublishAlways + Include="@(_ResolvedFileToPublishAlways)" + Condition="'$(PublishSingleFile)' != 'true' or + '%(_ResolvedFileToPublishAlways.ExcludeFromSingleFile)'=='true'" /> + + DependsOnTargets="_ComputeResolvedFilesToPublishTypes; + _ComputeFilesToBundle"> diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs index 45830ba1b77c..b543f9a01ab4 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs @@ -115,7 +115,7 @@ public void GroupPopulatedCorrectlyWithSingleFile() var buildCommand = new BuildCommand(Log, testAsset.Path, testProject.Name); buildCommand - .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:PublishItemsOutputGroup") + .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:Publish;PublishItemsOutputGroup") .Should() .Pass(); @@ -144,7 +144,47 @@ public void GroupPopulatedCorrectlyWithSingleFile() } } - private TestProject SetupProject() + [CoreMSBuildAndWindowsOnlyFact] + public void GroupBuildsWithoutPublish() + { + var testProject = this.SetupProject(addCopyFilesTargets: false); + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var restoreCommand = new RestoreCommand(Log, testAsset.Path, testProject.Name); + restoreCommand + .Execute() + .Should() + .Pass(); + + var buildCommand = new BuildCommand(Log, testAsset.Path, testProject.Name); + buildCommand + .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:PublishItemsOutputGroup") + .Should() + .Pass(); + } + + [CoreMSBuildAndWindowsOnlyFact] + public void GroupBuildDoesNotGeneratePublishFiles() + { + var testProject = this.SetupProject(); + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var restoreCommand = new RestoreCommand(Log, testAsset.Path, testProject.Name); + restoreCommand + .Execute() + .Should() + .Pass(); + + var buildCommand = new BuildCommand(Log, testAsset.Path, testProject.Name); + + // Since this build tries to copies all the final publish artifacts without calling the publish target it should fail + buildCommand + .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:PublishItemsOutputGroup") + .Should() + .Fail(); + } + + private TestProject SetupProject(bool addCopyFilesTargets = true) { var testProject = new TestProject() { @@ -159,23 +199,26 @@ private TestProject SetupProject() // Use a test-specific packages folder testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\..\pkg"; - // Add a target that will dump the contents of the PublishItemsOutputGroup to - // a test directory after building. - testProject.CopyFilesTargets.Add(new CopyFilesTarget( - "CopyPublishItemsOutputGroup", - "PublishItemsOutputGroup", - "@(PublishItemsOutputGroupOutputs)", - null, - "$(MSBuildProjectDirectory)\\TestOutput")); - - // Add another target that will dump the members of PublishItemsOutputGroup that - // have property IsKeyOutput set to true to a different test directory. - testProject.CopyFilesTargets.Add(new CopyFilesTarget( - "CopyPublishKeyItemsOutputGroup", - "PublishItemsOutputGroup", - "@(PublishItemsOutputGroupOutputs)", - @"'%(PublishItemsOutputGroupOutputs.IsKeyOutput)' == 'True'", - "$(MSBuildProjectDirectory)\\TestOutput_Key")); + if (addCopyFilesTargets) + { + // Add a target that will dump the contents of the PublishItemsOutputGroup to + // a test directory after building. + testProject.CopyFilesTargets.Add(new CopyFilesTarget( + "CopyPublishItemsOutputGroup", + "PublishItemsOutputGroup", + "@(PublishItemsOutputGroupOutputs)", + null, + "$(MSBuildProjectDirectory)\\TestOutput")); + + // Add another target that will dump the members of PublishItemsOutputGroup that + // have property IsKeyOutput set to true to a different test directory. + testProject.CopyFilesTargets.Add(new CopyFilesTarget( + "CopyPublishKeyItemsOutputGroup", + "PublishItemsOutputGroup", + "@(PublishItemsOutputGroupOutputs)", + @"'%(PublishItemsOutputGroupOutputs.IsKeyOutput)' == 'True'", + "$(MSBuildProjectDirectory)\\TestOutput_Key")); + } return testProject; } From 4f0015a634c93127cf2f9af39b21c5811c1cb4af Mon Sep 17 00:00:00 2001 From: Luke Westendorf Date: Thu, 19 Mar 2020 15:07:01 -0700 Subject: [PATCH 575/896] Simplifying new test --- .../PublishItemsOutputGroupTests.cs | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs index b543f9a01ab4..cabdb60926de 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs @@ -158,30 +158,15 @@ public void GroupBuildsWithoutPublish() var buildCommand = new BuildCommand(Log, testAsset.Path, testProject.Name); buildCommand - .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:PublishItemsOutputGroup") - .Should() - .Pass(); - } - - [CoreMSBuildAndWindowsOnlyFact] - public void GroupBuildDoesNotGeneratePublishFiles() - { - var testProject = this.SetupProject(); - var testAsset = _testAssetsManager.CreateTestProject(testProject); - - var restoreCommand = new RestoreCommand(Log, testAsset.Path, testProject.Name); - restoreCommand - .Execute() + .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true", "/t:PublishItemsOutputGroup") .Should() .Pass(); - var buildCommand = new BuildCommand(Log, testAsset.Path, testProject.Name); - - // Since this build tries to copies all the final publish artifacts without calling the publish target it should fail - buildCommand - .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true;PublishSingleFile=true", "/t:PublishItemsOutputGroup") + // Confirm we were able to build the output group without the publish actually happening + var publishDir = new DirectoryInfo(Path.Combine(buildCommand.GetOutputDirectory(testProject.TargetFrameworks).FullName, "win-x86", "publish")); + publishDir .Should() - .Fail(); + .NotExist(); } private TestProject SetupProject(bool addCopyFilesTargets = true) From 668718f15a6c3d58fb52dcaaf739b477aca6f85a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 22:57:22 +0000 Subject: [PATCH 576/896] Update dependencies from https://github.com/dotnet/sdk build 20200323.1 (#4416) - Microsoft.NET.Sdk - 3.1.300-preview.20173.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9adfee3e30e7..5ed23a152a89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli b234867cb3322666b420a7be8fc89c4196d19b3e - + https://github.com/dotnet/sdk - ab67b97f347912176cbc9f94ab76c5645d245af6 + a1af8fb4a842393917f9cda201fc1322eb0b675f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 0df00d6d8cfa..5841eeb78193 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20167.4 + 3.1.300-preview.20173.1 From eedc14af13bc1fdc6f4a6db3b3583ef5e40cb82e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 00:57:40 +0000 Subject: [PATCH 577/896] Update dependencies from https://github.com/dotnet/sdk build 20200323.1 (#13287) - Microsoft.NET.Sdk - 3.1.300-preview.20173.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0f60c8e05b9..37fd32a134b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - ab67b97f347912176cbc9f94ab76c5645d245af6 + a1af8fb4a842393917f9cda201fc1322eb0b675f https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index cedaf274c505..56680cedf4f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20167.4 + 3.1.300-preview.20173.1 $(MicrosoftNETSdkPackageVersion) From fb36998b12e1c49bcd17aa75567b3e7b6f195f76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 02:30:29 +0000 Subject: [PATCH 578/896] Update dependencies from https://github.com/dotnet/cli build 20200324.1 (#4418) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20174.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ed23a152a89..8af49a56213a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - b234867cb3322666b420a7be8fc89c4196d19b3e + eedc14af13bc1fdc6f4a6db3b3583ef5e40cb82e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5841eeb78193..0fce09d02738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20168.1 + 3.1.300-preview.20174.1 From addbdf352b2a92285187f1193d60f409df22d4ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 01:53:42 +0000 Subject: [PATCH 579/896] [release/3.1.3xx] Update dependencies from dotnet/core-setup (#4430) * Update dependencies from https://github.com/dotnet/core-setup build 20200326.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.1 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.1 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.3-servicing.20128.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200326.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.3 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.3 Dependency coherency updates - Microsoft.NET.Sdk.WindowsDesktop - 3.1.3-servicing.20128.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 501b40803f3a..5f35a52f33f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8af49a56213a..9a5a86ab184b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 2364c9f773d5604e7fc5d0a1555c4b077e898583 - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 2364c9f773d5604e7fc5d0a1555c4b077e898583 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - + https://github.com/dotnet/wpf - 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 + b8c0f1ed4a1cd2cdd8dcbebc5ccff99993d4c3dd https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 0fce09d02738..fb7fb6326409 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.2-servicing.20066.4 + 3.1.3-servicing.20128.4 @@ -78,8 +78,8 @@ 3.1.0 - 3.1.2-servicing.20067.4 - 3.1.2 + 3.1.4-servicing.20176.3 + 3.1.4-servicing.20176.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 1224643e567bc13c061b3cfdd69d607b230de697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 03:21:53 +0000 Subject: [PATCH 580/896] Update dependencies from https://github.com/aspnet/websdk build 20200326.5 (#4434) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20176.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a5a86ab184b..f47a7c0a0753 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 9385873eaf845bb0565d61a579633840d5a9d377 + 0495d6617d7034c8bde5569d3a6622525ef49a79 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index fb7fb6326409..e6def06b1913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20163.2 + 3.1.300-servicing.20176.5 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 35421c11987a7f2b1225a34c53a2d41766a93592 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 04:22:55 +0000 Subject: [PATCH 581/896] Update dependencies from https://github.com/dotnet/core-setup build 20200326.4 (#4436) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.4 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f47a7c0a0753..d3898cbcac73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 2364c9f773d5604e7fc5d0a1555c4b077e898583 + 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/core-setup - 2364c9f773d5604e7fc5d0a1555c4b077e898583 + 08b96bae4b5127c9ab110182fdd51e6a045803cf https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e6def06b1913..2b1bd08b36fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 3.1.0 - 3.1.4-servicing.20176.3 - 3.1.4-servicing.20176.3 + 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 76eadf66b8174535d44c227e51f46d988d68acbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 08:15:30 +0000 Subject: [PATCH 582/896] Update dependencies from https://github.com/aspnet/websdk build 20200327.3 (#4440) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20177.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3898cbcac73..92e0c99382ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 0495d6617d7034c8bde5569d3a6622525ef49a79 + 38f478533946c93dee59f8caab7f6adcb8c0865e https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 2b1bd08b36fb..a9e5d5eb4756 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20176.5 + 3.1.300-servicing.20177.3 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From d244ae227e362b7874cea30fe9fafc922ded7c16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 13:46:16 +0000 Subject: [PATCH 583/896] Update dependencies from https://github.com/dotnet/templating build 20200327.1 (#13306) - Microsoft.TemplateEngine.Cli - 3.1.4-servicing.20177.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37fd32a134b1..729188a799a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 247f60e9e34a03ed99e855eb1ea0c20931a968db + 55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 56680cedf4f7..14ed97809377 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.1.2-servicing.20064.1 + 3.1.4-servicing.20177.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From c9dc5ce5a7ddcb0c9df7ea58b882c646d09055e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 20:42:50 +0000 Subject: [PATCH 584/896] Update dependencies from https://github.com/dotnet/cli build 20200327.3 (#4444) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20177.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e0c99382ec..8c9413ead244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/cli - eedc14af13bc1fdc6f4a6db3b3583ef5e40cb82e + d244ae227e362b7874cea30fe9fafc922ded7c16 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9e5d5eb4756..55a5f3f3b4e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20174.1 + 3.1.300-preview.20177.3 From 4b9d669c75649b77e42a2898682b19dc7907f296 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2020 00:03:54 +0000 Subject: [PATCH 585/896] Update dependencies from https://github.com/aspnet/websdk build 20200327.7 (#4446) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20177.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c9413ead244..04123e73fa32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 38f478533946c93dee59f8caab7f6adcb8c0865e + 44af395823ae02ab0fdb38485331de43c33dd8af https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 55a5f3f3b4e6..a2e7cee03a96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20177.3 + 3.1.300-servicing.20177.7 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From aa1717252f7abbdf811bfbac80298b8eccbb1ba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Mar 2020 04:33:15 +0000 Subject: [PATCH 586/896] [release/3.1.3xx] Update dependencies from aspnet/websdk (#4452) * Update dependencies from https://github.com/aspnet/websdk build 20200328.4 - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20178.4 * Update dependencies from https://github.com/aspnet/websdk build 20200328.7 - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20178.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04123e73fa32..d8befc62819b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 44af395823ae02ab0fdb38485331de43c33dd8af + 1549ef088402d2b5177dcf3eb32d4cad295075f9 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index a2e7cee03a96..fab76ba00f28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20177.7 + 3.1.300-servicing.20178.7 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From e2bfedc0df6bd642ac64b32fcfd97c41b32e5f4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 05:33:54 +0000 Subject: [PATCH 587/896] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#13300) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20176.8 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20176.12 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.16 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20176.16 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200327.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20177.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200328.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20178.5 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200328.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20178.10 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 729188a799a2..b7508a52ad88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx e946cebe43a510e8c6476bbc8185d1445df33a1a - + https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + 306ef044cf9c8500d4d37f930f2b3f64380b2622 diff --git a/eng/Versions.props b/eng/Versions.props index 14ed97809377..09d19c66a00b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.2-servicing.20068.1 + 3.1.4-servicing.20178.10 From b90f3aeb88e31f9519482ab5f665e953056598d5 Mon Sep 17 00:00:00 2001 From: Andy Zivkovic Date: Sun, 29 Mar 2020 23:32:23 -0700 Subject: [PATCH 588/896] Update NuGet to 5.6.0.6489 (#10847) * Update NuGet to 5.6.0.6489 * Update Version.Details.xml with new NuGet version info * Update stage 0 Co-authored-by: William Li --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0fb58e0eae26..ee8df0ddba99 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.300-preview-015039", + "dotnet": "3.1.300-preview-015049", "vs-opt": { "version": "15.9" } From f7b67e73e3ab0f09a3bfebedf50e1846a3f2b597 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 06:57:09 +0000 Subject: [PATCH 589/896] Update dependencies from https://github.com/dotnet/cli build 20200329.2 (#4459) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20179.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8befc62819b..dbc09117de87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/cli - d244ae227e362b7874cea30fe9fafc922ded7c16 + e2bfedc0df6bd642ac64b32fcfd97c41b32e5f4e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fab76ba00f28..4e90c540f66e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20177.3 + 3.1.300-preview.20179.2 From 0ab220394458d16a905233db281311c2ca59e706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 07:24:01 +0000 Subject: [PATCH 590/896] Update dependencies from https://github.com/dotnet/sdk build 20200329.9 (#4462) - Microsoft.NET.Sdk - 3.1.300-preview.20179.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbc09117de87..c2a136e2c17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli e2bfedc0df6bd642ac64b32fcfd97c41b32e5f4e - + https://github.com/dotnet/sdk - a1af8fb4a842393917f9cda201fc1322eb0b675f + b90f3aeb88e31f9519482ab5f665e953056598d5 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4e90c540f66e..56a720598a96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20173.1 + 3.1.300-preview.20179.9 From 69c8ff7c8682a515d13c491a433f0eb66abf4be1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 17:23:18 +0000 Subject: [PATCH 591/896] Update dependencies from https://github.com/dotnet/sdk build 20200329.9 (#13320) - Microsoft.NET.Sdk - 3.1.300-preview.20179.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7508a52ad88..ccc3d0f041a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - a1af8fb4a842393917f9cda201fc1322eb0b675f + b90f3aeb88e31f9519482ab5f665e953056598d5 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 09d19c66a00b..7027075a0666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20173.1 + 3.1.300-preview.20179.9 $(MicrosoftNETSdkPackageVersion) From fc21194245ab64fa6bef8abeb22497142ca87a2c Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 30 Mar 2020 11:56:38 -0700 Subject: [PATCH 592/896] Add retry on docker build (#13312) --- scripts/dockerrun.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index 1ffd92ee6335..85be13d65000 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -105,9 +105,30 @@ fi # VSO [ ! -z "$BUILD_BUILDID" ] && DOTNET_BUILD_CONTAINER_NAME="$BUILD_BUILDID" +function retry { + local max_count=$1 + shift + + local count=0 + until "$@"; do + exit=$? + wait=$((2 ** $count)) + count=$(($count + 1)) + if [[ ${count} -lt ${max_count} ]]; then + echo "Retry $count/$max_count returned $exit, wait $wait seconds..." + sleep ${wait} + else + echo "Retry $count/$max_count returned $exit." + return ${exit} + fi + done + return 0 +} + # Build the docker container (will be fast if it is already built) +# with retry since docker pull has high failure rate echo "Building Docker Container using Dockerfile: $DOCKERFILE" -docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE +retry 10 docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE 2>&1 # Run the build in the container echo "Launching build in Docker Container" From ed33ca4bed0bb91298c053887ee000d2439bcf59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 20:49:05 +0000 Subject: [PATCH 593/896] [release/3.1.3xx] Update dependencies from dotnet/cli (#4465) * Update dependencies from https://github.com/dotnet/cli build 20200330.2 - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20180.2 * Update dependencies from https://github.com/dotnet/cli build 20200330.4 - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20180.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a136e2c17b..0457f3d96aed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/cli - e2bfedc0df6bd642ac64b32fcfd97c41b32e5f4e + fc21194245ab64fa6bef8abeb22497142ca87a2c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 56a720598a96..7b05051a8650 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20179.2 + 3.1.300-preview.20180.4 From 9077c1d9dc166e73f3773436888f63618bd9084c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 Mar 2020 22:29:40 +0000 Subject: [PATCH 594/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6532 - NuGet.Build.Tasks - 5.6.0-preview.2.6532 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eb31e4c47c3..5dccd5bf80ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 5433d816f748d4ad78b75fc320397d8117f57771 + 1c2681b16a0bb9be9271abe043a1cbf892761ef8 diff --git a/eng/Versions.props b/eng/Versions.props index 93ea8433cd6e..73792c81bd2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.6.0-preview.2.6489 + 5.6.0-preview.2.6532 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From 1837ca4aeb5bbe3af2e6801c92dcb15de7cdd3fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 22:45:36 +0000 Subject: [PATCH 595/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6532 (#4468) - NuGet.Build.Tasks - 5.6.0-preview.2.6532 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0457f3d96aed..f9a126eecd92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf b8c0f1ed4a1cd2cdd8dcbebc5ccff99993d4c3dd - + https://github.com/NuGet/NuGet.Client - 5433d816f748d4ad78b75fc320397d8117f57771 + 1c2681b16a0bb9be9271abe043a1cbf892761ef8 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 7b05051a8650..81541ae9b2e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.6.0-preview.2.6489 + 5.6.0-preview.2.6532 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 74f56dd1d2e2ae1b243296fb6f64bcead26d6f34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 23:43:57 +0000 Subject: [PATCH 596/896] Update dependencies from https://github.com/dotnet/core-setup build 20200331.1 (#4470) - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f35a52f33f0..338cf4bc4d87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a126eecd92..45ff014bc8d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 08b96bae4b5127c9ab110182fdd51e6a045803cf + 87da73b3299b0dd151585d3811bd9b5dec30318b - + https://github.com/dotnet/core-setup - 08b96bae4b5127c9ab110182fdd51e6a045803cf + 87da73b3299b0dd151585d3811bd9b5dec30318b https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 81541ae9b2e7..0be20fd0b4f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 3.1.0 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 + 3.1.4-servicing.20181.1 + 3.1.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 0699a36d21addff58e4747335236888ce74693e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 03:34:40 +0000 Subject: [PATCH 597/896] Update dependencies from https://github.com/dotnet/core-setup build 20200331.2 (#4475) - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 338cf4bc4d87..fd0d0c196a87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45ff014bc8d5..e24661bdaf13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/core-setup - 87da73b3299b0dd151585d3811bd9b5dec30318b + 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 - + https://github.com/dotnet/core-setup - 87da73b3299b0dd151585d3811bd9b5dec30318b + 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 0be20fd0b4f1..8ee19de3349b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ 3.1.0 - 3.1.4-servicing.20181.1 + 3.1.4-servicing.20181.2 3.1.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From a018b0c548e3ec715bb86406296a0468ad66cb80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 07:26:23 +0000 Subject: [PATCH 598/896] Update dependencies from https://github.com/aspnet/websdk build 20200331.6 (#4478) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20181.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e24661bdaf13..f8d270778ac9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/aspnet/websdk - 1549ef088402d2b5177dcf3eb32d4cad295075f9 + c69608be63c919c84cfcb93eaea669630950435a https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 8ee19de3349b..338283768f15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20178.7 + 3.1.300-servicing.20181.6 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From febda38c73ccec5f5d6f8dd75ba7e5328ade47de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 15:59:55 +0000 Subject: [PATCH 599/896] Update dependencies from https://github.com/dotnet/aspnetcore build 20200331.15 (#13328) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.4-servicing.20181.15 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccc3d0f041a4..adcabbced608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx e946cebe43a510e8c6476bbc8185d1445df33a1a - + https://github.com/dotnet/aspnetcore - 306ef044cf9c8500d4d37f930f2b3f64380b2622 + ffab087b73506f6622eff69e087efcb557efeef4 diff --git a/eng/Versions.props b/eng/Versions.props index 7027075a0666..20a0a24a08c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.4-servicing.20178.10 + 3.1.4-servicing.20181.15 From 2507ab449012973c2b22d6586d6477627bdf1a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 16:03:24 +0000 Subject: [PATCH 600/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6532 (#13324) - NuGet.Build.Tasks - 5.6.0-preview.2.6532 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adcabbced608..8d46685ef6e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 5433d816f748d4ad78b75fc320397d8117f57771 + 1c2681b16a0bb9be9271abe043a1cbf892761ef8 diff --git a/eng/Versions.props b/eng/Versions.props index 20a0a24a08c9..25b8b26b2c2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.6.0-preview.2.6489 + 5.6.0-preview.2.6532 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 157867f68032642f60d9d25f6485b4db5ce7ff82 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 1 Apr 2020 09:57:55 -0700 Subject: [PATCH 601/896] Fix renaming issue with copying ComReferences during publishing. --- .../targets/Microsoft.NET.Publish.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index 7251e0592e19..a6073b3753ec 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -446,7 +446,7 @@ Copyright (c) .NET Foundation. All rights reserved. - @(ReferenceComWrappersToCopyLocal->'%(Filename)%(Extension)') + %(Filename)%(Extension) PreserveNewest From 49d15ac01e0027a5e5e8373b6a2299d967cfd7d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 17:04:37 +0000 Subject: [PATCH 602/896] Update dependencies from https://github.com/dotnet/cli build 20200401.2 (#4481) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20201.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8d270778ac9..af72d1a404be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 - + https://github.com/dotnet/cli - fc21194245ab64fa6bef8abeb22497142ca87a2c + febda38c73ccec5f5d6f8dd75ba7e5328ade47de https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 338283768f15..d2ca56157b0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20180.4 + 3.1.300-preview.20201.2 From a96b4249eb7f2a43db5cb2d7d8ad792dd88eb78c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 17:17:09 +0000 Subject: [PATCH 603/896] Update dependencies from https://github.com/dotnet/cli build 20200401.4 (#4482) - Microsoft.DotNet.Cli.Runtime - 3.1.300-preview.20201.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af72d1a404be..f7f9ae9f9818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 - + https://github.com/dotnet/cli - febda38c73ccec5f5d6f8dd75ba7e5328ade47de + 2507ab449012973c2b22d6586d6477627bdf1a59 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d2ca56157b0f..c08938af5ba3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20201.2 + 3.1.300-preview.20201.4 From e4e10c9ea878d1709555d03798477649ae6a1b4c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 1 Apr 2020 11:09:24 -0700 Subject: [PATCH 604/896] Add 3.1 and 3.1 transport feeds --- NuGet.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 9b43cf88a8a1..9f980177a7cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,8 @@ - + + From b9cd04c696ffa06c97e319342e0edce7fbec85cc Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 1 Apr 2020 14:56:04 -0700 Subject: [PATCH 605/896] Add tests for publishing COM References. --- .../COMReferenceTests.cs | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs index 41a61f49dc46..cb1ec5653530 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs @@ -84,5 +84,88 @@ class MediaPlayerClass { } var runCommand = new RunExeCommand(Log, outputDirectory.File("UseMediaPlayer.exe").FullName); runCommand.Execute().Should().Pass(); } + + [FullMSBuildOnlyFact(Skip ="Too much dependency on build machine state.")] + public void COMReferenceProperlyPublish() + { + var targetFramework = "netcoreapp3.0"; + + + var testProject = new TestProject + { + Name = "MultiComReference", + IsSdkProject = true, + TargetFrameworks = targetFramework, + IsExe = true, + SourceFiles = + { + ["Program.cs"] = @" + using MediaPlayer; + class Program + { + static void Main(string[] args) + { + var mediaPlayer = (IMediaPlayer2)new MediaPlayerClass(); + } + } + ", + ["MediaPlayerClass.cs"] = @" + using System.Runtime.InteropServices; + namespace MediaPlayer + { + [ComImport] + [Guid(""22D6F312-B0F6-11D0-94AB-0080C74C7E95"")] + class MediaPlayerClass { } + } + " + } + }; + + var mediaPlayerComRef = "MediaPlayer.dll"; + var reference1 = new XElement("ItemGroup", + new XElement("COMReference", + new XAttribute("Include", mediaPlayerComRef), + new XElement("Guid", "22d6f304-b0f6-11d0-94ab-0080c74c7e95"), + new XElement("VersionMajor", "1"), + new XElement("VersionMinor", "0"), + new XElement("WrapperTool", "tlbimp"), + new XElement("Lcid", "0"), + new XElement("Isolated", "false"), + new XElement("EmbedInteropTypes", "false"))); + + var vslangProj80ComRef = "VSLangProj80.dll"; + var reference2 = new XElement("ItemGroup", + new XElement("COMReference", + new XAttribute("Include", vslangProj80ComRef), + new XElement("Guid", "307953c0-7973-490a-a4a7-25999e023be8"), + new XElement("VersionMajor", "8"), + new XElement("VersionMinor", "0"), + new XElement("WrapperTool", "tlbimp"), + new XElement("Lcid", "0"), + new XElement("Isolated", "false"), + new XElement("EmbedInteropTypes", "false"))); + + var testAsset = _testAssetsManager + .CreateTestProject(testProject) + .WithProjectChanges(doc => doc.Root.Add(new[] { reference1, reference2 })); + + var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + buildCommand.Execute().Should().Pass(); + + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework); + + // COM References by default adds the 'Interop.' prefix. + Assert.True(outputDirectory.File($"Interop.{mediaPlayerComRef}").Exists); + Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand.Execute().Should().Pass(); + + outputDirectory = publishCommand.GetOutputDirectory(targetFramework); + + // COM References by default adds the 'Interop.' prefix. + Assert.True(outputDirectory.File($"Interop.{mediaPlayerComRef}").Exists); + Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); + } } } From 8604a0f7ccc451c7e0ffe98151608fd6aa14973b Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 1 Apr 2020 15:23:52 -0700 Subject: [PATCH 606/896] Update COMReference publish test to use VS COM servers --- .../COMReferenceTests.cs | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs index cb1ec5653530..4185748ee330 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs @@ -85,7 +85,7 @@ class MediaPlayerClass { } runCommand.Execute().Should().Pass(); } - [FullMSBuildOnlyFact(Skip ="Too much dependency on build machine state.")] + [FullMSBuildOnlyFact] public void COMReferenceProperlyPublish() { var targetFramework = "netcoreapp3.0"; @@ -100,45 +100,34 @@ public void COMReferenceProperlyPublish() SourceFiles = { ["Program.cs"] = @" - using MediaPlayer; class Program { static void Main(string[] args) { - var mediaPlayer = (IMediaPlayer2)new MediaPlayerClass(); } } - ", - ["MediaPlayerClass.cs"] = @" - using System.Runtime.InteropServices; - namespace MediaPlayer - { - [ComImport] - [Guid(""22D6F312-B0F6-11D0-94AB-0080C74C7E95"")] - class MediaPlayerClass { } - } " } }; - var mediaPlayerComRef = "MediaPlayer.dll"; + var vslangProj80ComRef = "VSLangProj80.dll"; var reference1 = new XElement("ItemGroup", new XElement("COMReference", - new XAttribute("Include", mediaPlayerComRef), - new XElement("Guid", "22d6f304-b0f6-11d0-94ab-0080c74c7e95"), - new XElement("VersionMajor", "1"), + new XAttribute("Include", vslangProj80ComRef), + new XElement("Guid", "307953c0-7973-490a-a4a7-25999e023be8"), + new XElement("VersionMajor", "8"), new XElement("VersionMinor", "0"), new XElement("WrapperTool", "tlbimp"), new XElement("Lcid", "0"), new XElement("Isolated", "false"), new XElement("EmbedInteropTypes", "false"))); - var vslangProj80ComRef = "VSLangProj80.dll"; + var vslangProj90ComRef = "VSLangProj90.dll"; var reference2 = new XElement("ItemGroup", new XElement("COMReference", - new XAttribute("Include", vslangProj80ComRef), - new XElement("Guid", "307953c0-7973-490a-a4a7-25999e023be8"), - new XElement("VersionMajor", "8"), + new XAttribute("Include", vslangProj90ComRef), + new XElement("Guid", "dcbf68c6-da4b-44f5-b9e0-1563ec000392"), + new XElement("VersionMajor", "9"), new XElement("VersionMinor", "0"), new XElement("WrapperTool", "tlbimp"), new XElement("Lcid", "0"), @@ -155,8 +144,8 @@ class MediaPlayerClass { } var outputDirectory = buildCommand.GetOutputDirectory(targetFramework); // COM References by default adds the 'Interop.' prefix. - Assert.True(outputDirectory.File($"Interop.{mediaPlayerComRef}").Exists); Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); + Assert.True(outputDirectory.File($"Interop.{vslangProj90ComRef}").Exists); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); publishCommand.Execute().Should().Pass(); @@ -164,8 +153,8 @@ class MediaPlayerClass { } outputDirectory = publishCommand.GetOutputDirectory(targetFramework); // COM References by default adds the 'Interop.' prefix. - Assert.True(outputDirectory.File($"Interop.{mediaPlayerComRef}").Exists); Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); + Assert.True(outputDirectory.File($"Interop.{vslangProj90ComRef}").Exists); } } } From 0c7603edf09400426d12ec869ba42ea9db5d6a33 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 1 Apr 2020 15:41:53 -0700 Subject: [PATCH 607/896] Update all COM Reference tests to use VS COM servers. --- .../COMReferenceTests.cs | 51 +++++++------------ 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs index 4185748ee330..b36533e36087 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs @@ -19,60 +19,44 @@ public COMReferenceTests(ITestOutputHelper log) : base(log) { } - [FullMSBuildOnlyTheory(Skip ="Too much dependency on build machine state.")] + [FullMSBuildOnlyTheory()] [InlineData(true)] [InlineData(false)] public void COMReferenceBuildsAndRuns(bool embedInteropTypes) { var targetFramework = "netcoreapp3.0"; - var testProject = new TestProject { - Name = "UseMediaPlayer", + Name = "UseComReferences", IsSdkProject = true, TargetFrameworks = targetFramework, IsExe = true, SourceFiles = { ["Program.cs"] = @" - using MediaPlayer; class Program { static void Main(string[] args) { - var mediaPlayer = (IMediaPlayer2)new MediaPlayerClass(); + System.Console.WriteLine(typeof(VSLangProj.VSProject)); } } ", } }; - if (embedInteropTypes) - { - testProject.SourceFiles.Add("MediaPlayerClass.cs", @" - using System.Runtime.InteropServices; - namespace MediaPlayer - { - [ComImport] - [Guid(""22D6F312-B0F6-11D0-94AB-0080C74C7E95"")] - class MediaPlayerClass { } - } - "); - } - var reference = new XElement("ItemGroup", new XElement("COMReference", - new XAttribute("Include", "MediaPlayer.dll"), - new XElement("Guid", "22d6f304-b0f6-11d0-94ab-0080c74c7e95"), - new XElement("VersionMajor", "1"), + new XAttribute("Include", "VSLangProj.dll"), + new XElement("Guid", "49a1950e-3e35-4595-8cb9-920c64c44d67"), + new XElement("VersionMajor", "7"), new XElement("VersionMinor", "0"), new XElement("WrapperTool", "tlbimp"), new XElement("Lcid", "0"), new XElement("Isolated", "false"), new XElement("EmbedInteropTypes", embedInteropTypes))); - var testAsset = _testAssetsManager .CreateTestProject(testProject, identifier: embedInteropTypes.ToString()) .WithProjectChanges(doc => doc.Root.Add(reference)); @@ -81,7 +65,7 @@ class MediaPlayerClass { } buildCommand.Execute().Should().Pass(); var outputDirectory = buildCommand.GetOutputDirectory(targetFramework); - var runCommand = new RunExeCommand(Log, outputDirectory.File("UseMediaPlayer.exe").FullName); + var runCommand = new RunExeCommand(Log, outputDirectory.File("UseComReferences.exe").FullName); runCommand.Execute().Should().Pass(); } @@ -90,7 +74,6 @@ public void COMReferenceProperlyPublish() { var targetFramework = "netcoreapp3.0"; - var testProject = new TestProject { Name = "MultiComReference", @@ -110,24 +93,24 @@ static void Main(string[] args) } }; - var vslangProj80ComRef = "VSLangProj80.dll"; + var vslangProj70ComRef = "VSLangProj.dll"; var reference1 = new XElement("ItemGroup", new XElement("COMReference", - new XAttribute("Include", vslangProj80ComRef), - new XElement("Guid", "307953c0-7973-490a-a4a7-25999e023be8"), - new XElement("VersionMajor", "8"), + new XAttribute("Include", vslangProj70ComRef), + new XElement("Guid", "49a1950e-3e35-4595-8cb9-920c64c44d67"), + new XElement("VersionMajor", "7"), new XElement("VersionMinor", "0"), new XElement("WrapperTool", "tlbimp"), new XElement("Lcid", "0"), new XElement("Isolated", "false"), new XElement("EmbedInteropTypes", "false"))); - var vslangProj90ComRef = "VSLangProj90.dll"; + var vslangProj80ComRef = "VSLangProj80.dll"; var reference2 = new XElement("ItemGroup", new XElement("COMReference", - new XAttribute("Include", vslangProj90ComRef), - new XElement("Guid", "dcbf68c6-da4b-44f5-b9e0-1563ec000392"), - new XElement("VersionMajor", "9"), + new XAttribute("Include", vslangProj80ComRef), + new XElement("Guid", "307953c0-7973-490a-a4a7-25999e023be8"), + new XElement("VersionMajor", "8"), new XElement("VersionMinor", "0"), new XElement("WrapperTool", "tlbimp"), new XElement("Lcid", "0"), @@ -144,8 +127,8 @@ static void Main(string[] args) var outputDirectory = buildCommand.GetOutputDirectory(targetFramework); // COM References by default adds the 'Interop.' prefix. + Assert.True(outputDirectory.File($"Interop.{vslangProj70ComRef}").Exists); Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); - Assert.True(outputDirectory.File($"Interop.{vslangProj90ComRef}").Exists); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); publishCommand.Execute().Should().Pass(); @@ -153,8 +136,8 @@ static void Main(string[] args) outputDirectory = publishCommand.GetOutputDirectory(targetFramework); // COM References by default adds the 'Interop.' prefix. + Assert.True(outputDirectory.File($"Interop.{vslangProj70ComRef}").Exists); Assert.True(outputDirectory.File($"Interop.{vslangProj80ComRef}").Exists); - Assert.True(outputDirectory.File($"Interop.{vslangProj90ComRef}").Exists); } } } From 70c879000dee5c847beb2e681c1df7cd04ef9cee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 23:32:59 +0000 Subject: [PATCH 608/896] Update dependencies from https://github.com/dotnet/fsharp build 20200401.5 (#4484) - Microsoft.FSharp.Compiler - 10.9.1-beta.20201.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7f9ae9f9818..caabc2399b92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 00781ad1353afba25451148dba61845ac139b572 - + https://github.com/dotnet/fsharp - 4567bf9ec74d800e609cdc6bdd9f45bdd1a9bde6 + 2aacc46d56a688c58da5bbbdabf84c42e582a970 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c08938af5ba3..daf9017534d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.8.0-beta.20113.9 + 10.9.1-beta.20201.5 From cd9c2dcfb7aa9bf4e60a02bcb6f64fdb14afd45c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 01:49:56 +0000 Subject: [PATCH 609/896] Update dependencies from https://github.com/dotnet/fsharp build 20200401.6 (#4485) - Microsoft.FSharp.Compiler - 10.9.1-beta.20201.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caabc2399b92..2c8ff34dc9ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,7 +25,7 @@ https://github.com/microsoft/msbuild 00781ad1353afba25451148dba61845ac139b572 - + https://github.com/dotnet/fsharp 2aacc46d56a688c58da5bbbdabf84c42e582a970 diff --git a/eng/Versions.props b/eng/Versions.props index daf9017534d2..432d7a64dcab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20201.5 + 10.9.1-beta.20201.6 From 583a132ebc28877bdda5411c7551ab8d3d16d992 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Apr 2020 12:06:06 +0000 Subject: [PATCH 610/896] Update dependencies from https://github.com/microsoft/vstest build 20200401-02 - Microsoft.NET.Test.Sdk - 16.6.0 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c8ff34dc9ce..82a25d60acb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/NuGet/NuGet.Client 1c2681b16a0bb9be9271abe043a1cbf892761ef8 - + https://github.com/microsoft/vstest - 55e7e45431c9c05656c999b902686e7402664573 + d10bcbb28cc3999bcc12758a41a04b998eb9595b https://github.com/aspnet/websdk diff --git a/eng/Versions.props b/eng/Versions.props index 432d7a64dcab..d2653fa1cb91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ - 16.5.0 + 16.6.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 543d6d4a8c452af35f947cc82bb637cf2bc078fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Apr 2020 21:24:24 +0000 Subject: [PATCH 611/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6558 - NuGet.Build.Tasks - 5.6.0-preview.3.6558 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dccd5bf80ca..2efa3d602d78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 1c2681b16a0bb9be9271abe043a1cbf892761ef8 + 863fc6bb184cccfe12caa03bea91b0ddc48843da diff --git a/eng/Versions.props b/eng/Versions.props index 73792c81bd2a..6d31eea1d21a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.6.0-preview.2.6532 + 5.6.0-preview.3.6558 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From c958b9c6f2bbafa22e5e7b7c5eb7b900a92fab42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Apr 2020 21:25:09 +0000 Subject: [PATCH 612/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6558 - NuGet.Build.Tasks - 5.6.0-preview.3.6558 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d46685ef6e4..7976154c2d6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 1c2681b16a0bb9be9271abe043a1cbf892761ef8 + 863fc6bb184cccfe12caa03bea91b0ddc48843da diff --git a/eng/Versions.props b/eng/Versions.props index 25b8b26b2c2a..3e6e9bf14e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.6.0-preview.2.6532 + 5.6.0-preview.3.6558 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 067f54aa5c6996ed78b080b783375419f8d98034 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 7 Apr 2020 15:45:02 -0700 Subject: [PATCH 613/896] Revert to 3.1.2 runtime (#4489) --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd0d0c196a87..501b40803f3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82a25d60acb8..6fb97612ffff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/core-setup - 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 + 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/core-setup - 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/cli @@ -38,9 +38,9 @@ 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 - + https://github.com/dotnet/wpf - b8c0f1ed4a1cd2cdd8dcbebc5ccff99993d4c3dd + 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index d2653fa1cb91..0ada6bc86894 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 3.1.3-servicing.20128.4 + 3.1.2-servicing.20066.4 @@ -78,8 +78,8 @@ 3.1.0 - 3.1.4-servicing.20181.2 - 3.1.4 + 3.1.2-servicing.20067.4 + 3.1.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From 528fe2eeae2a8c97094b2d3b88cee80e5a78a8ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 23:28:17 +0000 Subject: [PATCH 614/896] Update dependencies from https://github.com/aspnet/websdk build 20200407.2 (#4491) - Microsoft.NET.Sdk.Web - 3.1.300-servicing.20207.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb97612ffff..1f6aefbcc34c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest d10bcbb28cc3999bcc12758a41a04b998eb9595b - + https://github.com/aspnet/websdk - c69608be63c919c84cfcb93eaea669630950435a + 5db372f879b61425c3baf44e6202655334c8bd0b https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 0ada6bc86894..53de114a048a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20181.6 + 3.1.300-servicing.20207.2 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From f9921dc4cea1cf0afcdff9da1dc36b366b0817a0 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 08:26:37 -0700 Subject: [PATCH 615/896] Pin HostModel (#11187) Pin the host model at 3.1.2. It is not required that we update HostModel except to test a new runtime in the SDK, or if breaking changes were made. When this host model does change. it requires that we pull a new stage0 SDK from dotnet/installer, which is a significant cost. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eb31e4c47c3..c15a48d309b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,7 +15,7 @@ https://github.com/dotnet/arcade 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 From 35c974b553111d163fa117bd06f5f07d4bc4cb4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 15:32:00 +0000 Subject: [PATCH 616/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6558 (#4490) - NuGet.Build.Tasks - 5.6.0-preview.3.6558 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Sarah Oslund --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6aefbcc34c..1f2f9ce09ec9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 1c2681b16a0bb9be9271abe043a1cbf892761ef8 + 863fc6bb184cccfe12caa03bea91b0ddc48843da https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 53de114a048a..e6694fd71ffe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.6.0-preview.2.6532 + 5.6.0-preview.3.6558 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 9a28573101b9743761620bdfffb143368dbc6c4e Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 08:37:41 -0700 Subject: [PATCH 617/896] Revert to 3.1.2 templates --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d46685ef6e4..9ac7e2fc264b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac + 247f60e9e34a03ed99e855eb1ea0c20931a968db https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 25b8b26b2c2a..a8c3d6fc18b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.1.4-servicing.20177.1 + 3.1.2-servicing.20064.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From c208acdbf2d2ab026809e164862e1e4b965c41fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 15:41:57 +0000 Subject: [PATCH 618/896] [release/3.1.3xx] Update dependencies from dotnet/fsharp (#4488) * Update dependencies from https://github.com/dotnet/fsharp build 20200402.5 - Microsoft.FSharp.Compiler - 10.9.1-beta.20202.5 * Update dependencies from https://github.com/dotnet/fsharp build 20200406.2 - Microsoft.FSharp.Compiler - 10.9.1-beta.20206.2 * Update dependencies from https://github.com/dotnet/fsharp build 20200406.7 - Microsoft.FSharp.Compiler - 10.9.1-beta.20206.7 * Removing problematic core setup feed Co-authored-by: dotnet-maestro[bot] Co-authored-by: Sarah Oslund --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f2f9ce09ec9..ae91ad5de347 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 00781ad1353afba25451148dba61845ac139b572 - + https://github.com/dotnet/fsharp - 2aacc46d56a688c58da5bbbdabf84c42e582a970 + 6902edc80c4a1adf454808fca6180ac9a89bdb4a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e6694fd71ffe..4a2dc8c04df6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20201.6 + 10.9.1-beta.20206.7 From b686c38cfcc91852be0cae7d117d42d234368e98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 16:20:56 +0000 Subject: [PATCH 619/896] Update dependencies from https://github.com/dotnet/sdk build 20200408.5 (#4492) - Microsoft.NET.Sdk - 3.1.300-preview.20208.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae91ad5de347..997382221311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 2507ab449012973c2b22d6586d6477627bdf1a59 - + https://github.com/dotnet/sdk - b90f3aeb88e31f9519482ab5f665e953056598d5 + f9921dc4cea1cf0afcdff9da1dc36b366b0817a0 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4a2dc8c04df6..b67f170f4973 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20179.9 + 3.1.300-preview.20208.5 From c12d6fdde4ac662d6a295379e976f71aece2d9f7 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 14:24:48 -0700 Subject: [PATCH 620/896] [release/3.1.3xx] Revert to 3.1.2 runtime (#13335) * Revert to 3.1.2 runtime * Update Alpine3.6 imgage * Newer dockerfile * Use correct buildtools repo Co-authored-by: Will Godbe --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- scripts/docker/alpine.3.6/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d46685ef6e4..c42785e8e457 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,9 +31,9 @@ https://github.com/dotnet/corefx e946cebe43a510e8c6476bbc8185d1445df33a1a - + https://github.com/dotnet/aspnetcore - ffab087b73506f6622eff69e087efcb557efeef4 + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc diff --git a/eng/Versions.props b/eng/Versions.props index 25b8b26b2c2a..ac7a136a850d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 3.1.4-servicing.20181.15 + 3.1.2-servicing.20068.1 diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile index 2dc797963633..fbb5a4253a93 100644 --- a/scripts/docker/alpine.3.6/Dockerfile +++ b/scripts/docker/alpine.3.6/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3e800f1-20190501005341 # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker # from issuing a warning From 58c022841898ccdda9a6aea39047d136ce0409a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 22:29:44 +0000 Subject: [PATCH 621/896] Update dependencies from https://github.com/dotnet/cli build 20200408.6 (#4494) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20201.4 -> 3.1.300-preview.20208.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 997382221311..d4131e98d1b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 2507ab449012973c2b22d6586d6477627bdf1a59 + c12d6fdde4ac662d6a295379e976f71aece2d9f7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b67f170f4973..6eb859a88f47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20201.4 + 3.1.300-preview.20208.6 From b1edaf48eede72281919ab235c268fc5955b8bf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 22:55:11 +0000 Subject: [PATCH 622/896] Update dependencies from https://github.com/dotnet/roslyn build 20200408.17 (#4495) - Microsoft.Net.Compilers.Toolset: 3.5.0-beta4-20153-05 -> 3.6.0-3.20208.17 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4131e98d1b1..cbd2c9c678b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 6902edc80c4a1adf454808fca6180ac9a89bdb4a - + https://github.com/dotnet/roslyn - 20b9af913f1b8ce0a62f72bea9e75e4aa3cf6b0e + c77153cb46c1034c916bbeb5168b9a97e41d11ee https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 6eb859a88f47..2b580ad7b5e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.5.0-beta4-20153-05 + 3.6.0-3.20208.17 From f0c6d87fffcd00c933d816c9dcefd0c1cfc62110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 23:03:04 +0000 Subject: [PATCH 623/896] Update dependencies from https://github.com/dotnet/fsharp build 20200408.1 (#4496) - Microsoft.FSharp.Compiler: 10.9.1-beta.20206.7 -> 10.9.1-beta.20208.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbd2c9c678b3..1efec34528d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 00781ad1353afba25451148dba61845ac139b572 - + https://github.com/dotnet/fsharp - 6902edc80c4a1adf454808fca6180ac9a89bdb4a + 10043323acdd504c07eed27bd37b9bc5499a4139 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2b580ad7b5e9..8bd731b88057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20206.7 + 10.9.1-beta.20208.1 From 1ca8f637534c6434615edd0789eb41567ae5e5fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 23:23:42 +0000 Subject: [PATCH 624/896] Update dependencies from https://github.com/dotnet/cli build 20200408.10 (#4497) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20208.6 -> 3.1.300-preview.20208.10 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1efec34528d8..8778e8c6f0c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - c12d6fdde4ac662d6a295379e976f71aece2d9f7 + 852c2b91625929013934f2020fa1b2d392ae826c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8bd731b88057..4396255985c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20208.6 + 3.1.300-preview.20208.10 From ec9f52ad35d7c8030587ab73dabb2cd1b804a9d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 04:19:49 +0000 Subject: [PATCH 625/896] Update dependencies from https://github.com/dotnet/cli build 20200408.16 (#4498) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20208.10 -> 3.1.300-preview.20208.16 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8778e8c6f0c8..f03300e543fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 852c2b91625929013934f2020fa1b2d392ae826c + 3d56cab8337f3cf6fdfa203ffab96925f907bf57 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4396255985c0..8133bb5137fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20208.10 + 3.1.300-preview.20208.16 From 6e0c224d58737a8f33639c726ee211cda1846e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 07:47:50 +0000 Subject: [PATCH 626/896] Update dependencies from https://github.com/dotnet/roslyn build 20200409.2 (#4499) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20208.17 -> 3.6.0-3.20209.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f03300e543fb..b5e2245955ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - c77153cb46c1034c916bbeb5168b9a97e41d11ee + ed485ab08bafc6c3d69e9e104571d9a73c07da69 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 8133bb5137fe..91748a04fc92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20208.17 + 3.6.0-3.20209.2 From 6b4dfcada20cf6858bd8ec25103cbcad77525204 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:10:08 +0000 Subject: [PATCH 627/896] Update dependencies from https://github.com/dotnet/roslyn build 20200409.3 (#4500) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20209.2 -> 3.6.0-3.20209.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e2245955ba..dbf4f78f6b23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - ed485ab08bafc6c3d69e9e104571d9a73c07da69 + 34fad56309fc96f2af1171df6ea012cbf991c27d https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 91748a04fc92..36f74279e10c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20209.2 + 3.6.0-3.20209.3 From d6108f64a78589d9e0af6812a1919f3211f6fab8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 19:24:36 +0000 Subject: [PATCH 628/896] Update dependencies from https://github.com/dotnet/roslyn build 20200409.5 (#4501) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20209.3 -> 3.6.0-3.20209.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbf4f78f6b23..887adc3d7013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - 34fad56309fc96f2af1171df6ea012cbf991c27d + c777377333b317436cfe4e33de200a7a28c07772 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 36f74279e10c..0dc94f0d5332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20209.3 + 3.6.0-3.20209.5 From c87ab9c99ddc8a2c9ed3809d074870abd559b784 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 21:30:05 +0000 Subject: [PATCH 629/896] Update dependencies from https://github.com/dotnet/roslyn build 20200409.6 (#4502) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20209.5 -> 3.6.0-3.20209.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 887adc3d7013..50c675048667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - c777377333b317436cfe4e33de200a7a28c07772 + fc1d4e1a896654f444601fd08dcf1e01bf6e5ae0 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 0dc94f0d5332..d7800738fa4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20209.5 + 3.6.0-3.20209.6 From 20e3bd931fb2474c36da403f055c53399d0d581d Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 9 Apr 2020 16:31:40 -0700 Subject: [PATCH 630/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ee8df0ddba99..f8c67ba23dac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.300-preview-015049", + "dotnet": "3.1.300-preview-015084", "vs-opt": { "version": "15.9" } From 169f4eb28e7398fecab88c3ed3639ea94f38b28d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 01:44:45 +0000 Subject: [PATCH 631/896] Update dependencies from https://github.com/dotnet/roslyn build 20200410.3 (#4503) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20209.6 -> 3.7.0-1.20210.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50c675048667..6f7a43d840e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,7 +29,7 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn fc1d4e1a896654f444601fd08dcf1e01bf6e5ae0 diff --git a/eng/Versions.props b/eng/Versions.props index d7800738fa4a..3975c9750db4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20209.6 + 3.7.0-1.20210.3 From cfbb43f95db08a9cdbf85d019b5d9c3ed9616e21 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 9 Apr 2020 22:47:43 -0700 Subject: [PATCH 632/896] Remove unnecessary test This test is testing CSC behavior. It does not test SDK code. The behaivor is also changed due to https://github.com/dotnet/roslyn/pull/42769 --- .../GivenThereAreDefaultItems.cs | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 7b073664a77c..bc6a290ba5a7 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -527,46 +527,6 @@ public void It_gives_an_error_message_if_duplicate_compile_items_are_included() .And.HaveStdOutContaining("EnableDefaultCompileItems"); } - [Fact] - public void It_gives_the_correct_error_if_duplicate_compile_items_are_included_and_default_items_are_disabled() - { - var testProject = new TestProject() - { - Name = "DuplicateCompileItems", - TargetFrameworks = "netstandard1.6", - IsSdkProject = true - }; - - var testAsset = _testAssetsManager.CreateTestProject(testProject, "DuplicateCompileItemsWithDefaultItemsDisabled") - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - - project.Root.Element(ns + "PropertyGroup").Add( - new XElement(ns + "EnableDefaultCompileItems", "false")); - - var itemGroup = new XElement(ns + "ItemGroup"); - project.Root.Add(itemGroup); - itemGroup.Add(new XElement(ns + "Compile", new XAttribute("Include", @"**\*.cs"))); - itemGroup.Add(new XElement(ns + "Compile", new XAttribute("Include", @"DuplicateCompileItems.cs"))); - }); - - var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); - - WriteFile(Path.Combine(buildCommand.ProjectRootPath, "Class1.cs"), "public class Class1 {}"); - - buildCommand - .Execute() - .Should() - .Fail() - .And.HaveStdOutContaining("DuplicateCompileItems.cs") - // Class1.cs wasn't included multiple times, so it shouldn't be mentioned - .And.NotHaveStdOutMatching("Class1.cs") - // Default items weren't enabled, so the error message should come from the C# compiler and shouldn't include the information about default compile items - .And.HaveStdOutContaining("MSB3105") - .And.NotHaveStdOutMatching("EnableDefaultCompileItems"); - } - [Fact] public void Implicit_package_references_are_overridden_by_PackageReference_includes_in_the_project_file() { From 6385129b5539d40cb7c18c1c208aa2344d5290f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Apr 2020 10:46:21 +0000 Subject: [PATCH 633/896] Update dependencies from https://github.com/dotnet/roslyn build 20200410.9 - Microsoft.Net.Compilers.Toolset: 3.7.0-1.20210.3 -> 3.6.0-3.20210.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f7a43d840e1..89a834e7b92c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - fc1d4e1a896654f444601fd08dcf1e01bf6e5ae0 + 4eafdcb1bcbd8d3573f2ba6065e56d9b9ce4f8a3 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 3975c9750db4..6c92d1d9a3d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-1.20210.3 + 3.6.0-3.20210.9 From c9c10a6237daf341e34bc1af53fa2d1c667ac866 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Apr 2020 14:44:07 +0000 Subject: [PATCH 634/896] Update dependencies from https://github.com/dotnet/sdk build 20200410.1 - Microsoft.NET.Sdk: 3.1.300-preview.20179.9 -> 3.1.300-preview.20210.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 082180e2f28f..58048fcd5116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - b90f3aeb88e31f9519482ab5f665e953056598d5 + 6f3d0952c6f206eca675ea1b9ed87f5e8cde2791 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 7213f1ebf76f..9f100cdd6bab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20179.9 + 3.1.300-preview.20210.1 $(MicrosoftNETSdkPackageVersion) From 94b0b3c283fd237f2b022493a42687eb5e0d4fa4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 14:54:15 +0000 Subject: [PATCH 635/896] Update dependencies from https://github.com/dotnet/sdk build 20200410.1 (#4505) - Microsoft.NET.Sdk: 3.1.300-preview.20208.5 -> 3.1.300-preview.20210.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89a834e7b92c..d42347da0e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 3d56cab8337f3cf6fdfa203ffab96925f907bf57 - + https://github.com/dotnet/sdk - f9921dc4cea1cf0afcdff9da1dc36b366b0817a0 + 6f3d0952c6f206eca675ea1b9ed87f5e8cde2791 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6c92d1d9a3d8..dc28a97d0685 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20208.5 + 3.1.300-preview.20210.1 From c958e02a8803bdc2248e0c58743c07445799d36d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Apr 2020 16:26:14 +0000 Subject: [PATCH 636/896] Update dependencies from https://github.com/microsoft/msbuild build 20200410.9 - Microsoft.Build.Localization: 16.6.0-preview-20162-03 -> 16.6.0-preview-20210-09 - Microsoft.Build: 16.6.0-preview-20162-03 -> 16.6.0-preview-20210-09 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d42347da0e19..5b0bd1dcb0a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 6f3d0952c6f206eca675ea1b9ed87f5e8cde2791 - + https://github.com/microsoft/msbuild - 00781ad1353afba25451148dba61845ac139b572 + 2f58c1427384aaf012d616ae12849e7d9b5c0f10 - + https://github.com/microsoft/msbuild - 00781ad1353afba25451148dba61845ac139b572 + 2f58c1427384aaf012d616ae12849e7d9b5c0f10 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dc28a97d0685..b03c381b3b71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.6.0-preview-20162-03 + 16.6.0-preview-20210-09 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.6.0-preview-20162-03 + 16.6.0-preview-20210-09 $(MicrosoftBuildPackageVersion) From 01749d0c139fbb4f39293db7e49824c913fa2520 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 16:32:25 +0000 Subject: [PATCH 637/896] Update dependencies from https://github.com/dotnet/cli build 20200410.1 (#4506) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20208.16 -> 3.1.300-preview.20210.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d42347da0e19..f8329984c42e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 3d56cab8337f3cf6fdfa203ffab96925f907bf57 + 209400a54bf682f7f7bd8e8166881e8b45e8c607 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index dc28a97d0685..4a1bc23d5215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20208.16 + 3.1.300-preview.20210.1 From e3d7ed498d7b27cf22b139cad3ddc9c3f9d2dd22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2020 21:52:22 +0000 Subject: [PATCH 638/896] Update dependencies from https://github.com/dotnet/roslyn build 20200413.1 (#4508) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20210.9 -> 3.6.0-3.20213.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5005e15ca42f..272cb8a6990e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 10043323acdd504c07eed27bd37b9bc5499a4139 - + https://github.com/dotnet/roslyn - 4eafdcb1bcbd8d3573f2ba6065e56d9b9ce4f8a3 + 3375a7b209d1f590940af043e9e39f2cbb503845 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 182d13996cc6..1961d82ec220 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20210.9 + 3.6.0-3.20213.1 From 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Apr 2020 16:34:36 -0700 Subject: [PATCH 639/896] Fix conditions for Sign/Publish args (#11286) --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 13b76e445138..1d9c0a256abb 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -37,7 +37,7 @@ jobs: - _PublishArgs: '' - _SignArgs: '' - _TestArgs: $(_Test) - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access - group: dotnet-benchview From 2efd907f38ba3f18952a3a3d4a6a5e99bab0c316 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 00:36:17 +0000 Subject: [PATCH 640/896] Update dependencies from https://github.com/dotnet/sdk build 20200414.15 (#4509) - Microsoft.NET.Sdk: 3.1.300-preview.20210.1 -> 3.1.300-preview.20214.15 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 272cb8a6990e..fabde4c84a9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 209400a54bf682f7f7bd8e8166881e8b45e8c607 - + https://github.com/dotnet/sdk - 6f3d0952c6f206eca675ea1b9ed87f5e8cde2791 + 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 1961d82ec220..7c09bd25005f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20210.1 + 3.1.300-preview.20214.15 From bb7d11e7dbf88e14425c0b3519ff0324de15a883 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 15:52:28 +0000 Subject: [PATCH 641/896] Update dependencies from https://github.com/dotnet/sdk build 20200414.15 (#13342) - Microsoft.NET.Sdk: 3.1.300-preview.20210.1 -> 3.1.300-preview.20214.15 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58048fcd5116..9969dc194d49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 6f3d0952c6f206eca675ea1b9ed87f5e8cde2791 + 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 9f100cdd6bab..331306a6732a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20210.1 + 3.1.300-preview.20214.15 $(MicrosoftNETSdkPackageVersion) From 89ecdfce273a5900a393d1dbaf65e8778e06f04e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 16:49:19 +0000 Subject: [PATCH 642/896] Update dependencies from https://github.com/dotnet/cli build 20200415.1 (#4510) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20210.1 -> 3.1.300-preview.20215.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fabde4c84a9b..596c0d6f0123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 209400a54bf682f7f7bd8e8166881e8b45e8c607 + bb7d11e7dbf88e14425c0b3519ff0324de15a883 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7c09bd25005f..c86f6b5c5791 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20210.1 + 3.1.300-preview.20215.1 From f500d07b20b4d7719f6cde1c55e4c0520393cc19 Mon Sep 17 00:00:00 2001 From: v-chmart Date: Thu, 16 Apr 2020 09:43:44 +0200 Subject: [PATCH 643/896] LOC CHECKIN | dotnet/cli release/3.1.3xx | 20200416 --- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf | 2 +- src/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 8a281a7755f4..f7902dbae76d 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -43,7 +43,7 @@ The .NET Core tools collect usage data in order to help us improve your experien Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetría --------- -Las herramientas de .NET Core recopilan datos de uso para ayudarnos a ejorar su experiencia. Estos datos son anónimos. Microsoft los recopila y comparte con la comunidad. Puede optar por no participar en la telemetría si establece la variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en "1" o "true" mediante su shell favorito. +Las herramientas de .NET Core recopilan datos de uso para ayudarnos a mejorar su experiencia. Estos datos son anónimos. Microsoft los recopila y comparte con la comunidad. Puede optar por no participar en la telemetría si establece la variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en "1" o "true" mediante su shell favorito. Lea más sobre la telemetría de las herramientas de la CLI de .NET Core: https://aka.ms/dotnet-cli-telemetry diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 9cc36e20e3dd..1c5dbed2f941 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -582,7 +582,7 @@ export PATH="$PATH:{0}" The template {0} created successfully. run "dotnet restore" to get started! - Le modèle {0} a été créé. Exécutez "dotnet restore" pour commencer ! + Le modèle {0} a été créé. Exécutez "dotnet restore" pour démarrer ! From 013275a58635f55e431000ac9951d59dd37a689e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 18:09:42 +0000 Subject: [PATCH 644/896] Update dependencies from https://github.com/aspnet/websdk build 20200416.7 (#4512) - Microsoft.NET.Sdk.Web: 3.1.300-servicing.20207.2 -> 3.1.300-servicing.20216.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 596c0d6f0123..5d98d9617487 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/microsoft/vstest d10bcbb28cc3999bcc12758a41a04b998eb9595b - + https://github.com/aspnet/websdk - 5db372f879b61425c3baf44e6202655334c8bd0b + 990aaecc44681278516397d801ec3b4077bb6553 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index c86f6b5c5791..3e74135b3bec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 3.1.300-servicing.20207.2 + 3.1.300-servicing.20216.7 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) From 3eee13c76fee9b25a27be3e396cb5533aa25470b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 18:26:37 +0000 Subject: [PATCH 645/896] Update dependencies from https://github.com/microsoft/msbuild build 20200416.3 (#4513) - Microsoft.Build.Localization: 16.6.0-preview-20210-09 -> 16.6.0-preview-20216-03 - Microsoft.Build: 16.6.0-preview-20210-09 -> 16.6.0-preview-20216-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d98d9617487..52d99029033b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf - + https://github.com/microsoft/msbuild - 2f58c1427384aaf012d616ae12849e7d9b5c0f10 + 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/microsoft/msbuild - 2f58c1427384aaf012d616ae12849e7d9b5c0f10 + 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3e74135b3bec..a9b4d9d4b46a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.6.0-preview-20210-09 + 16.6.0-preview-20216-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.6.0-preview-20210-09 + 16.6.0-preview-20216-03 $(MicrosoftBuildPackageVersion) From 8ebdb32cae172f21ea2fc4647e241be4c1c51df8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 19:28:43 +0000 Subject: [PATCH 646/896] Update dependencies from https://github.com/dotnet/cli build 20200416.1 (#4514) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20215.1 -> 3.1.300-preview.20216.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52d99029033b..b4bcd956c384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - bb7d11e7dbf88e14425c0b3519ff0324de15a883 + c2dffacdbf51da60981325f7e3d91bd8ab99b85f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9b4d9d4b46a..119f823bf1d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20215.1 + 3.1.300-preview.20216.1 From 1f608e00cd7e78eb595c0c79b4018b6716e1da3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 20:57:57 +0000 Subject: [PATCH 647/896] Update dependencies from https://github.com/dotnet/fsharp build 20200416.2 (#4515) - Microsoft.FSharp.Compiler: 10.9.1-beta.20208.1 -> 10.9.1-beta.20216.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4bcd956c384..80a6d0775387 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 10043323acdd504c07eed27bd37b9bc5499a4139 + e6b00aff25c0771ee903c028c3f2c867589c8924 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 119f823bf1d5..fa7475fe96a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20208.1 + 10.9.1-beta.20216.2 From fefa81d362a7b2ff0eec5fe5b830c38f388a3a6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2020 21:08:16 +0000 Subject: [PATCH 648/896] Update dependencies from https://github.com/dotnet/fsharp build 20200417.4 (#4516) - Microsoft.FSharp.Compiler: 10.9.1-beta.20216.2 -> 10.9.1-beta.20217.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80a6d0775387..841ae6a49ac4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - e6b00aff25c0771ee903c028c3f2c867589c8924 + 1c969cac25e2d38d71872efe6c8226029e42bb59 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fa7475fe96a8..41d3ae42028e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20216.2 + 10.9.1-beta.20217.4 From 30b4797e5427388d5411e0d86716590c53de47c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Apr 2020 21:08:35 +0000 Subject: [PATCH 649/896] Update dependencies from https://github.com/dotnet/fsharp build 20200417.3 - Microsoft.FSharp.Compiler: 10.9.1-beta.20217.4 -> 10.9.1-beta.20217.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 841ae6a49ac4..0060dc77a21b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 1c969cac25e2d38d71872efe6c8226029e42bb59 + c965e12a3bf8940dddc3464fc8bcf7e63296a887 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 41d3ae42028e..863e7589454f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20217.4 + 10.9.1-beta.20217.3 From 2d07fde7c54ff1017084a93c1313b4d2fc5058f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 22:21:41 +0000 Subject: [PATCH 650/896] Update dependencies from https://github.com/dotnet/roslyn build 20200418.3 (#4518) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20213.1 -> 3.6.0-3.20218.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 841ae6a49ac4..ff11a3c11d51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 1c969cac25e2d38d71872efe6c8226029e42bb59 - + https://github.com/dotnet/roslyn - 3375a7b209d1f590940af043e9e39f2cbb503845 + 37ad245fb9a7e7bf2e5b67eb377e1cf252765b6b https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 41d3ae42028e..c13ecdadd43e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20213.1 + 3.6.0-3.20218.3 From 68bfd549e9b0b027dac1c364142efeb3a778d185 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 20 Apr 2020 15:42:37 -0700 Subject: [PATCH 651/896] Branding update: 3.1.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6d31eea1d21a..00ec0eff5b9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ - 3.1.300 + 3.1.400 preview From 406afa73ffb0807634f3297ee10f357ca963e4db Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 20 Apr 2020 15:42:57 -0700 Subject: [PATCH 652/896] Branding update: 3.1.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 331306a6732a..35f23de06e58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.300 + 3.1.400 preview From 1b1f479c41c57f8945a597995670138dfb5a1cd3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 20 Apr 2020 15:43:16 -0700 Subject: [PATCH 653/896] Branding update: 3.1.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9b50628efe77..bc2867206666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 3.1.300 + 3.1.400 preview From 1d61cacc228230caa3842ff7e07c18d3307c48a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Apr 2020 22:54:13 +0000 Subject: [PATCH 654/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6592 - NuGet.Build.Tasks: 5.6.0-preview.3.6558 -> 5.7.0-preview.1.6592 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0017c9061796..1cea14f0d1d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 863fc6bb184cccfe12caa03bea91b0ddc48843da + 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 diff --git a/eng/Versions.props b/eng/Versions.props index 00ec0eff5b9e..02348ebf1be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.6.0-preview.3.6558 + 5.7.0-preview.1.6592 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From d7c3a268466695545f022251baa5ccc12ecf1ad8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 23:09:39 +0000 Subject: [PATCH 655/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6592 (#4527) - NuGet.Build.Tasks: 5.6.0-preview.3.6558 -> 5.7.0-preview.1.6592 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fa9ee888bac..5d269af01a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 863fc6bb184cccfe12caa03bea91b0ddc48843da + 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index bc2867206666..b02c6ede4b5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.6.0-preview.3.6558 + 5.7.0-preview.1.6592 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 67a5b8041affe8e996204729593fb6577669a4d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 19:36:40 +0000 Subject: [PATCH 656/896] Update dependencies from https://github.com/dotnet/fsharp build 20200429.4 (#4530) - Microsoft.FSharp.Compiler: 10.9.1-beta.20217.3 -> 10.10.0-beta.20229.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d269af01a15..5e24f6f329b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - c965e12a3bf8940dddc3464fc8bcf7e63296a887 + f4488d0e3a186bc3207d0590b91d6fd3f53167d3 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b02c6ede4b5a..84dcdb28cede 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.9.1-beta.20217.3 + 10.10.0-beta.20229.4 From cab620a503e9e2b288b0dca8e128e1c422f7368f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Apr 2020 22:54:27 +0000 Subject: [PATCH 657/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6592 - NuGet.Build.Tasks: 5.6.0-preview.3.6558 -> 5.7.0-preview.1.6592 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9969dc194d49..7d05d69a7db3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 863fc6bb184cccfe12caa03bea91b0ddc48843da + 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 diff --git a/eng/Versions.props b/eng/Versions.props index 35f23de06e58..c48fa7ee2686 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.6.0-preview.3.6558 + 5.7.0-preview.1.6592 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From cef5a2b74edc55e5fd4680a1424e2eafe6dfb69f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2020 23:22:49 +0000 Subject: [PATCH 658/896] Update dependencies from https://github.com/dotnet/arcade build 20200430.5 (#11512) - Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20113.5 -> 1.0.0-beta.20230.5 - Microsoft.DotNet.Helix.Sdk: 2.0.0-beta.20113.5 -> 2.0.0-beta.20230.5 - Microsoft.DotNet.SignTool: 1.0.0-beta.20113.5 -> 1.0.0-beta.20230.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ eng/common/tools.sh | 9 ++++++- global.json | 4 ++-- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0017c9061796..217a4a549a8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 00ec0eff5b9e..e6231beca9ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20113.5 + 1.0.0-beta.20230.5 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3c69186f03a7..d916c22003d3 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -365,4 +365,28 @@ stages: channelId: 760 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Publishing' + channelName: '.NET Core SDK 3.1.4xx' + channelId: 921 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.4xx Internal' + channelId: 922 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94965a8fd2a9..acbb0c5b3ffd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,7 +210,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index f8c67ba23dac..857df28ba750 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20230.5" } } From 33b8f92a786632c2f3d09ca1aff6014b1e6155b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2020 03:50:27 +0000 Subject: [PATCH 659/896] Update dependencies from https://github.com/dotnet/fsharp build 20200430.7 (#4533) - Microsoft.FSharp.Compiler: 10.10.0-beta.20229.4 -> 10.10.0-beta.20230.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e24f6f329b5..6faaac57a569 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - f4488d0e3a186bc3207d0590b91d6fd3f53167d3 + 082844d9aaa5d2893680b05a1fe0b77ee18719dd https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 84dcdb28cede..b8fb476feee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20229.4 + 10.10.0-beta.20230.7 From 1c768188666d2cdcdffe5cc9a35f8725c0561827 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2020 10:23:30 -0700 Subject: [PATCH 660/896] Update dependencies from https://github.com/dotnet/arcade build 20200430.5 (#4532) - Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20113.5 -> 1.0.0-beta.20230.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ eng/common/tools.sh | 9 ++++++- global.json | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6faaac57a569..5cd95c8670f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - 15f00efd583eab4372b2e9ca25bd80ace5b119ad + 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3c69186f03a7..d916c22003d3 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -365,4 +365,28 @@ stages: channelId: 760 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Publishing' + channelName: '.NET Core SDK 3.1.4xx' + channelId: 921 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.4xx Internal' + channelId: 922 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94965a8fd2a9..acbb0c5b3ffd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,7 +210,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index 9a1e57884873..f83388fc0582 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5" } } From 66ef43fb24f0b98fcf7cc6e7b42214225a08edb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 May 2020 21:49:44 +0000 Subject: [PATCH 661/896] Update dependencies from https://github.com/dotnet/sdk build 20200501.5 - Microsoft.NET.Sdk: 3.1.300-preview.20214.15 -> 3.1.400-preview.20251.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d05d69a7db3..1d831375f588 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf + cef5a2b74edc55e5fd4680a1424e2eafe6dfb69f https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index c48fa7ee2686..3c0b688686c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.300-preview.20214.15 + 3.1.400-preview.20251.5 $(MicrosoftNETSdkPackageVersion) From 99c85f1a70637f532561ada0bc7de25f9af86c2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2020 21:59:53 +0000 Subject: [PATCH 662/896] Update dependencies from https://github.com/dotnet/sdk build 20200501.5 (#4534) - Microsoft.NET.Sdk: 3.1.300-preview.20214.15 -> 3.1.400-preview.20251.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cd95c8670f6..10fa1109f7ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli c2dffacdbf51da60981325f7e3d91bd8ab99b85f - + https://github.com/dotnet/sdk - 6f0edb1dfaf5a6c780719794a7dd7d945c320ebf + cef5a2b74edc55e5fd4680a1424e2eafe6dfb69f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b8fb476feee5..efc8526a4718 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.300-preview.20214.15 + 3.1.400-preview.20251.5 From 6d173bb01bb4fff3868c391db0b11749a5af9552 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2020 23:29:11 +0000 Subject: [PATCH 663/896] Update dependencies from https://github.com/dotnet/arcade build 20200430.5 (#13348) - Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.19607.3 -> 1.0.0-beta.20230.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ eng/common/tools.sh | 9 ++++++- global.json | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d831375f588..100cc3e288e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3c69186f03a7..d916c22003d3 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -365,4 +365,28 @@ stages: channelId: 760 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Publishing' + channelName: '.NET Core SDK 3.1.4xx' + channelId: 921 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_314xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.4xx Internal' + channelId: 922 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94965a8fd2a9..acbb0c5b3ffd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,7 +210,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index 75b19fcabe8e..e7706d791b20 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5" } } From e1cbb1f2e8cca13fdd25140c9f29520e4460e729 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 00:30:50 +0000 Subject: [PATCH 664/896] Update dependencies from https://github.com/dotnet/cli build 20200501.3 (#4535) - Microsoft.DotNet.Cli.Runtime: 3.1.300-preview.20216.1 -> 3.1.400-preview.20251.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10fa1109f7ef..122e5025d034 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - c2dffacdbf51da60981325f7e3d91bd8ab99b85f + 6d173bb01bb4fff3868c391db0b11749a5af9552 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index efc8526a4718..b1da4b94f854 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.300-preview.20216.1 + 3.1.400-preview.20251.3 From eccf5821c2a94e583943b6815fa80a88cd2910e5 Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 2 May 2020 16:01:44 -0700 Subject: [PATCH 665/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index f8c67ba23dac..93a9e1f0846e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.300-preview-015084", + "dotnet": "3.1.400-preview-015128", "vs-opt": { "version": "15.9" } From d262ff88d41207b7b83fb985c62ba1bff7a3e4d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 May 2020 01:03:53 +0000 Subject: [PATCH 666/896] Update dependencies from https://github.com/dotnet/sdk build 20200502.7 (#4536) - Microsoft.NET.Sdk: 3.1.400-preview.20251.5 -> 3.1.400-preview.20252.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 122e5025d034..8cf9ceaadafd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 6d173bb01bb4fff3868c391db0b11749a5af9552 - + https://github.com/dotnet/sdk - cef5a2b74edc55e5fd4680a1424e2eafe6dfb69f + 6047903fd599e7704e8d97b9203ce004a4409942 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b1da4b94f854..e2e4267b7d66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20251.5 + 3.1.400-preview.20252.7 From 983e5e463595e381a7ca87d5ec93f0cf7387f03f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 May 2020 05:00:25 +0000 Subject: [PATCH 667/896] Update dependencies from https://github.com/dotnet/sdk build 20200502.7 (#13350) - Microsoft.NET.Sdk: 3.1.400-preview.20251.5 -> 3.1.400-preview.20252.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 100cc3e288e5..10c52508676e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - cef5a2b74edc55e5fd4680a1424e2eafe6dfb69f + 6047903fd599e7704e8d97b9203ce004a4409942 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 3c0b688686c5..530b9c326326 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20251.5 + 3.1.400-preview.20252.7 $(MicrosoftNETSdkPackageVersion) From feff8d3f11744bd3ae9e97fa4934382f7feaa708 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 May 2020 06:06:34 +0000 Subject: [PATCH 668/896] Update dependencies from https://github.com/dotnet/cli build 20200502.1 (#4537) - Microsoft.DotNet.Cli.Runtime: 3.1.400-preview.20251.3 -> 3.1.400-preview.20252.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cf9ceaadafd..f311daffff3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 6d173bb01bb4fff3868c391db0b11749a5af9552 + 983e5e463595e381a7ca87d5ec93f0cf7387f03f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e2e4267b7d66..0df7402ca8de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20251.3 + 3.1.400-preview.20252.1 From 4846e13682f84152ea6102972ac6f5b7874aafac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 22:47:31 +0000 Subject: [PATCH 669/896] Update dependencies from https://github.com/dotnet/fsharp build 20200504.4 (#4538) - Microsoft.FSharp.Compiler: 10.10.0-beta.20230.7 -> 10.10.0-beta.20254.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f311daffff3d..90cdeee7caed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 082844d9aaa5d2893680b05a1fe0b77ee18719dd + 7764ec334e5949e51b42e42799a8e742126fa6f4 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0df7402ca8de..d0e88b1176da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20230.7 + 10.10.0-beta.20254.4 From 0b3ab11255b008441f2b1cfaa5143d64ee204314 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 04:21:44 +0000 Subject: [PATCH 670/896] Update dependencies from https://github.com/dotnet/fsharp build 20200504.9 (#4539) - Microsoft.FSharp.Compiler: 10.10.0-beta.20254.4 -> 10.10.0-beta.20254.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90cdeee7caed..4fe2a2a9d911 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 7764ec334e5949e51b42e42799a8e742126fa6f4 + 9a70ba723daddc0207eb71c799637916d9b9a675 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d0e88b1176da..0426d086f6a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20254.4 + 10.10.0-beta.20254.9 From 5605fb29f6f4bfea5639842bb27813b441a6b2c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 05:57:42 +0000 Subject: [PATCH 671/896] Update dependencies from https://github.com/dotnet/fsharp build 20200505.2 (#4540) - Microsoft.FSharp.Compiler: 10.10.0-beta.20254.9 -> 10.10.0-beta.20255.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fe2a2a9d911..e3808d77c47c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 9a70ba723daddc0207eb71c799637916d9b9a675 + 5ea5d6913b1f7ce7692364726e262f253fd285bd https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0426d086f6a8..1d73d9c3607b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20254.9 + 10.10.0-beta.20255.2 From 211eca6ea83490a85a51537a9bc5e62ab18c0d33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 May 2020 18:05:58 +0000 Subject: [PATCH 672/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6609 (#4541) - NuGet.Build.Tasks: 5.7.0-preview.1.6592 -> 5.7.0-preview.1.6609 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3808d77c47c..a9b058c1f112 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 + 12a375a8a02764b772a20371abaf797639a7f961 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1d73d9c3607b..9d7bf1036c09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-preview.1.6592 + 5.7.0-preview.1.6609 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 95e89c0d38c6e392c0585948b383a80864280276 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 24 Apr 2020 12:37:39 -0700 Subject: [PATCH 673/896] Fix NullReferenceException in dotnet store --- .../TargetManifests/PrunePackages.xml | 36 +++++++++++++++++++ .../FilterResolvedFiles.cs | 2 +- .../ProjectContext.cs | 7 +++- ...atWeWantToStoreAProjectWithDependencies.cs | 35 ++++++++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/Assets/TestProjects/TargetManifests/PrunePackages.xml diff --git a/src/Assets/TestProjects/TargetManifests/PrunePackages.xml b/src/Assets/TestProjects/TargetManifests/PrunePackages.xml new file mode 100644 index 000000000000..d2841578b96f --- /dev/null +++ b/src/Assets/TestProjects/TargetManifests/PrunePackages.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(PackagesToPrune);@(PackageToPrune) + + + \ No newline at end of file diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs index 47c19f336ee7..e386a40dd910 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs @@ -69,7 +69,7 @@ protected override void ExecuteCore() var pkgName = packageItem.ItemSpec; if (!string.IsNullOrEmpty(pkgName)) { - packageClosure.UnionWith(projectContext.GetTransitiveList(pkgName)); + packageClosure.UnionWith(projectContext.GetTransitiveList(pkgName, ignoreIfNotFound: true)); } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index 93541ac5674e..7db21df9c4a3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.Build.Framework; +using Microsoft.DotNet.PlatformAbstractions; using NuGet.Packaging.Core; using NuGet.ProjectModel; using System; @@ -145,9 +146,13 @@ public IEnumerable GetRuntimeLibraries(IEnumerable GetTransitiveList(string package) + internal IEnumerable GetTransitiveList(string package, bool ignoreIfNotFound = false) { LockFileTargetLibrary platformLibrary = _lockFileTarget.GetLibrary(package); + if (platformLibrary == null && ignoreIfNotFound) + { + return Enumerable.Empty(); + } IEnumerable runtimeLibraries = _lockFileTarget.Libraries; Dictionary libraryLookup = runtimeLibraries.ToDictionary(e => e.Name, StringComparer.OrdinalIgnoreCase); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index 0b2137897fa7..e0577c39cda2 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -340,6 +340,41 @@ public void It_stores_when_targeting_netcoreapp3(bool isExe) }); } + [CoreMSBuildOnlyFact] + public void DotnetStoreWithPrunedPackages() + { + const string TargetFramework = "netcoreapp3.1"; + + TestAsset targetManifestsAsset = _testAssetsManager + .CopyTestAsset("TargetManifests") + .WithSource(); + + var outputFolder = Path.Combine(targetManifestsAsset.TestRoot, "o"); + var workingDir = Path.Combine(targetManifestsAsset.TestRoot, "w"); + + var composeStore = new ComposeStoreCommand(Log, targetManifestsAsset.TestRoot, "PrunePackages.xml") + .Execute( + $"/p:TargetFramework={TargetFramework}", + $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(TargetFramework)}", + $"/p:ComposeDir={outputFolder}", + $"/p:ComposeWorkingDir={workingDir}", + "/p:PreserveComposeWorkingDir=true", + "/p:DoNotDecorateComposeDir=true", + "/p:CreateProfilingSymbols=false" + ); + + composeStore.Should().Pass(); + + new DirectoryInfo(outputFolder).GetDirectories() + .Select(d => d.Name) + .Should().BeEquivalentTo( + "fluentassertions", + "newtonsoft.json", + "system.configuration.configurationmanager", + "system.security.cryptography.protecteddata"); + + } + private static HashSet ParseStoreArtifacts(string path) { return new HashSet( From eb0fb1e220863ae536b518ca8e12860ab43c9dbb Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Mon, 11 May 2020 11:34:35 +1000 Subject: [PATCH 674/896] Increase minimum required MSBuild to 16.7.0 Changes to the design-time build targets used to populate the dependency node mean that this SDK will only work with VS 16.7 or later. See https://github.com/dotnet/sdk/pull/11358 --- src/redist/minimumMSBuildVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/minimumMSBuildVersion b/src/redist/minimumMSBuildVersion index d9a8a3578858..2e4239c31313 100644 --- a/src/redist/minimumMSBuildVersion +++ b/src/redist/minimumMSBuildVersion @@ -1 +1 @@ -16.3.0 +16.7.0 From 10816d252e987f7a1161c8a1c7fe5a05f7326d2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 May 2020 18:27:25 +0000 Subject: [PATCH 675/896] Update dependencies from https://github.com/dotnet/sdk build 20200511.2 (#4543) - Microsoft.NET.Sdk: 3.1.400-preview.20252.7 -> 3.1.400-preview.20261.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9b058c1f112..c8d89798cb05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 983e5e463595e381a7ca87d5ec93f0cf7387f03f - + https://github.com/dotnet/sdk - 6047903fd599e7704e8d97b9203ce004a4409942 + f3663e3086f7a388d4ec53a438ecbf017e271f92 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9d7bf1036c09..2b4b4d1b929e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20252.7 + 3.1.400-preview.20261.2 From c65e15fb7a961f403de2fce586b327454bed2e25 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:28:30 +1100 Subject: [PATCH 676/896] Remove unused property setters --- .../PreprocessPackageDependenciesDesignTime.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index aa602d74fff6..e713d1893b01 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -54,19 +54,19 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase [Output] public ITaskItem[] DependenciesDesignTime { get; set; } - private Dictionary Targets { get; set; } + private Dictionary Targets { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary Packages { get; set; } + private Dictionary Packages { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary Assemblies { get; set; } + private Dictionary Assemblies { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary DiagnosticsMap { get; set; } + private Dictionary DiagnosticsMap { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary DependenciesWorld { get; set; } + private Dictionary DependenciesWorld { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); private HashSet ImplicitPackageReferences { get; set; } From 4148ba57174aed95b028f3389ecc4f72765248ee Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:28:41 +1100 Subject: [PATCH 677/896] Update documentation --- .../PreprocessPackageDependenciesDesignTime.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index e713d1893b01..7f67aa3545f1 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -15,8 +15,8 @@ namespace Microsoft.NET.Build.Tasks /// Task combines data returned from ResolvePackageDependencies into single items collection /// that can be consumed by DesignTime build and contains all info needed to expand packages /// dependency graph. - /// If any changes are made here, make sure corresponding changes are made to NuGetDependenciesSubTreeProvider - /// in roslyn-project-system repo and corresponding tests. + /// If any changes are made here, make sure corresponding changes are made to PackageRuleHandler + /// in the dotnet/project-system repo and corresponding tests. /// public class PreprocessPackageDependenciesDesignTime : TaskBase { From ce14bf983ada3134c5cd3659262d76a82a19c2bb Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:31:39 +1100 Subject: [PATCH 678/896] Simplify lazy initialization --- ...PreprocessPackageDependenciesDesignTime.cs | 2 +- .../ResolvePackageDependencies.cs | 26 ++----------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 7f67aa3545f1..240c26af31bf 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -84,7 +84,7 @@ protected override void ExecuteCore() PopulateAssemblies(); PopulateExistingReferenceItems(); - InputDiagnosticMessages = InputDiagnosticMessages ?? Array.Empty(); + InputDiagnosticMessages ??= Array.Empty(); PopulateDiagnosticsMap(); AddDependenciesToTheWorld(Packages, PackageDependencies); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index cd885abb656d..03400840f776 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -123,31 +123,9 @@ internal ResolvePackageDependencies(LockFile lockFile, IPackageResolver packageR #endregion - private IPackageResolver PackageResolver - { - get - { - if (_packageResolver == null) - { - _packageResolver = NuGetPackageResolver.CreateResolver(LockFile); - } - - return _packageResolver; - } - } + private IPackageResolver PackageResolver => _packageResolver ??= NuGetPackageResolver.CreateResolver(LockFile); - private LockFile LockFile - { - get - { - if (_lockFile == null) - { - _lockFile = new LockFileCache(this).GetLockFile(ProjectAssetsFile); - } - - return _lockFile; - } - } + private LockFile LockFile => _lockFile ??= new LockFileCache(this).GetLockFile(ProjectAssetsFile); /// /// Raise Nuget LockFile representation to MSBuild items From 1e77c0af0c030d07c30574fce4962e417f43d17f Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:34:47 +1100 Subject: [PATCH 679/896] Make methods static --- .../PreprocessPackageDependenciesDesignTime.cs | 2 +- .../Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 240c26af31bf..0efa03374355 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -267,7 +267,7 @@ private void PopulateDiagnosticsMap() } } - private DependencyType GetDependencyType(string dependencyTypeString) + private static DependencyType GetDependencyType(string dependencyTypeString) { var dependencyType = DependencyType.Unknown; if (!string.IsNullOrEmpty(dependencyTypeString)) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index 03400840f776..0769d9f99247 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -379,7 +379,7 @@ private string ResolvePackagePath(LockFileLibrary package) } } - private string ResolveFilePath(string relativePath, string resolvedPackagePath) + private static string ResolveFilePath(string relativePath, string resolvedPackagePath) { if (NuGetUtils.IsPlaceholderFile(relativePath)) { From e71eec1629179448f3945b97f4664869cd708b37 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:37:32 +1100 Subject: [PATCH 680/896] Reduce string allocations String.Replace(char, char) allocates a new string even if no replacement is made. --- .../ResolvePackageDependencies.cs | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index 0769d9f99247..a3985ecb9a9f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -385,12 +385,23 @@ private static string ResolveFilePath(string relativePath, string resolvedPackag { return null; } + + if (resolvedPackagePath == null) + { + return string.Empty; + } + + if (Path.DirectorySeparatorChar != '/') + { + relativePath = relativePath.Replace('/', Path.DirectorySeparatorChar); + } + + if (Path.DirectorySeparatorChar != '\\') + { + relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar); + } - relativePath = relativePath.Replace('/', Path.DirectorySeparatorChar); - relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar); - return resolvedPackagePath != null - ? Path.Combine(resolvedPackagePath, relativePath) - : string.Empty; + return Path.Combine(resolvedPackagePath, relativePath); } private string GetAbsolutePathFromProjectRelativePath(string path) From 6a5458579290668b50fb3b544b364399b8767c3a Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:38:05 +1100 Subject: [PATCH 681/896] Avoid array covariance --- .../PreprocessPackageDependenciesDesignTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 0efa03374355..449ff2321c7e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -118,7 +118,7 @@ protected override void ExecuteCore() } return newTaskItem; - }).ToArray(); + }).ToArray(); } /// From 69d73a12b890d3d3828064590d11d4410bad62a2 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:38:29 +1100 Subject: [PATCH 682/896] Remove redundant assignments --- .../PreprocessPackageDependenciesDesignTime.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 449ff2321c7e..f3c6fe96564f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -93,7 +93,7 @@ protected override void ExecuteCore() { // We keep analyzers and assemblies with CompileTimeAssembly metadata; skip everything else. - ItemMetadata itemMetadata = null; + ItemMetadata itemMetadata; if (Assemblies.TryGetValue(item.ItemSpec, out itemMetadata) && itemMetadata.Type == DependencyType.AnalyzerAssembly) { @@ -269,12 +269,7 @@ private void PopulateDiagnosticsMap() private static DependencyType GetDependencyType(string dependencyTypeString) { - var dependencyType = DependencyType.Unknown; - if (!string.IsNullOrEmpty(dependencyTypeString)) - { - Enum.TryParse(dependencyTypeString, /* ignoreCase */ true, out dependencyType); - } - + Enum.TryParse(dependencyTypeString, ignoreCase: true, out DependencyType dependencyType); return dependencyType; } @@ -317,7 +312,7 @@ private void AddDependenciesToTheWorld(Dictionary items, // update parent var parentDependencyId = $"{parentTargetId}/{parentPackageId}".Trim('/'); - ItemMetadata parentDependency = null; + ItemMetadata parentDependency; if (DependenciesWorld.TryGetValue(parentDependencyId, out parentDependency)) { parentDependency.Dependencies.Add(currentItemId); From 046b8e92966a3d7886672b61db191221405a728d Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:39:08 +1100 Subject: [PATCH 683/896] Array cannot be null or have negative item length --- .../PreprocessPackageDependenciesDesignTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index f3c6fe96564f..058db4ed1a70 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -704,7 +704,7 @@ internal static HashSet GetImplicitPackageReferences(string defaultImpli } var packageNames = defaultImplicitPackages.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - if (packageNames == null || packageNames.Length <= 0) + if (packageNames.Length == 0) { return implicitPackageReferences; } From 4b9f98029187fb9765e673de27d4c6bf6e05bfa9 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:43:35 +1100 Subject: [PATCH 684/896] Inline out var declarations --- .../PreprocessPackageDependenciesDesignTime.cs | 6 ++---- .../ResolvePackageDependencies.cs | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 058db4ed1a70..e52c79f75610 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -93,8 +93,7 @@ protected override void ExecuteCore() { // We keep analyzers and assemblies with CompileTimeAssembly metadata; skip everything else. - ItemMetadata itemMetadata; - if (Assemblies.TryGetValue(item.ItemSpec, out itemMetadata) && + if (Assemblies.TryGetValue(item.ItemSpec, out ItemMetadata itemMetadata) && itemMetadata.Type == DependencyType.AnalyzerAssembly) { return false; @@ -312,8 +311,7 @@ private void AddDependenciesToTheWorld(Dictionary items, // update parent var parentDependencyId = $"{parentTargetId}/{parentPackageId}".Trim('/'); - ItemMetadata parentDependency; - if (DependenciesWorld.TryGetValue(parentDependencyId, out parentDependency)) + if (DependenciesWorld.TryGetValue(parentDependencyId, out ItemMetadata parentDependency)) { parentDependency.Dependencies.Add(currentItemId); if (parentDependency.Type == DependencyType.Target) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index a3985ecb9a9f..86e75d5dd351 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -200,8 +200,7 @@ private void GetPackageAndFileDefinitions() else { // get a type for the file if one is available - string fileType; - if (!_fileTypes.TryGetValue(fileKey, out fileType)) + if (!_fileTypes.TryGetValue(fileKey, out string fileType)) { fileType = "unknown"; } @@ -276,8 +275,7 @@ private void GetPackageDependencies( TaskItem item; foreach (var deps in package.Dependencies) { - string version; - if (!resolvedPackageVersions.TryGetValue(deps.Id, out version)) + if (!resolvedPackageVersions.TryGetValue(deps.Id, out string version)) { continue; } @@ -348,8 +346,7 @@ private void SaveFileKeyType(string fileKey, FileGroup fileGroup) string fileType = fileGroup.GetTypeMetadata(); if (fileType != null) { - string currentFileType; - if (!_fileTypes.TryGetValue(fileKey, out currentFileType)) + if (!_fileTypes.TryGetValue(fileKey, out string currentFileType)) { _fileTypes.Add(fileKey, fileType); } From 2c9da2bcae75048a402255cef26cacc7b2952b3f Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:51:28 +1100 Subject: [PATCH 685/896] Reduce constructor visibilities --- .../PreprocessPackageDependenciesDesignTime.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index e52c79f75610..458cc57e9442 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -345,7 +345,7 @@ private ItemMetadata GetItem(Dictionary items, string id) private abstract class ItemMetadata { - public ItemMetadata(DependencyType type, IList dependencies = null, bool isTopLevelDependency = false) + protected ItemMetadata(DependencyType type, IList dependencies = null, bool isTopLevelDependency = false) { Type = type; Dependencies = dependencies == null ? new List() : new List(dependencies); @@ -444,7 +444,7 @@ public PackageMetadata(ITaskItem item) : item.GetMetadata(MetadataKeys.Path)) ?? string.Empty; } - protected PackageMetadata( + private PackageMetadata( DependencyType type, IList dependencies, bool isTopLevelDependency, From b556fabe3f6adae3004c2512d76837f605b3e323 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:56:48 +1100 Subject: [PATCH 686/896] Use local function --- .../PreprocessPackageDependenciesDesignTime.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 458cc57e9442..02420f7785cd 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -336,11 +336,13 @@ private void AddDependenciesToTheWorld(Dictionary items, DependenciesWorld[parentDependencyId] = parentDependency; } } - } - private ItemMetadata GetItem(Dictionary items, string id) - { - return Targets.Count > 1 ? items[id].Clone() : items[id]; + return; + + ItemMetadata GetItem(Dictionary items, string id) + { + return Targets.Count > 1 ? items[id].Clone() : items[id]; + } } private abstract class ItemMetadata From 4f69a00c6f93d481048dc14d93e140a86376c95e Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 17 Mar 2020 20:56:55 +1100 Subject: [PATCH 687/896] Formatting --- .../PreprocessPackageDependenciesDesignTime.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 02420f7785cd..72481478cc2a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -89,7 +89,7 @@ protected override void ExecuteCore() AddDependenciesToTheWorld(Packages, PackageDependencies); - AddDependenciesToTheWorld(Assemblies, FileDependencies, (item) => + AddDependenciesToTheWorld(Assemblies, FileDependencies, item => { // We keep analyzers and assemblies with CompileTimeAssembly metadata; skip everything else. @@ -111,7 +111,7 @@ protected override void ExecuteCore() DependenciesDesignTime = DependenciesWorld.Select(itemKvp => { var newTaskItem = new TaskItem(itemKvp.Key); - foreach(var metadataKvp in itemKvp.Value.ToDictionary()) + foreach (var metadataKvp in itemKvp.Value.ToDictionary()) { newTaskItem.SetMetadata(metadataKvp.Key, metadataKvp.Value); } @@ -378,7 +378,7 @@ protected ItemMetadata(DependencyType type, IList dependencies = null, b private class TargetMetadata : ItemMetadata { public TargetMetadata(ITaskItem item) - :base(DependencyType.Target) + : base(DependencyType.Target) { RuntimeIdentifier = item.GetMetadata(MetadataKeys.RuntimeIdentifier) ?? string.Empty; TargetFrameworkMoniker = item.GetMetadata(MetadataKeys.TargetFrameworkMoniker) ?? string.Empty; From 23256d32756f3ffb482cf8f3ad308c031eb223e8 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 19 Mar 2020 23:23:53 +1100 Subject: [PATCH 688/896] Remove diagnostics from PreprocessPackageDependenciesDesignTime These are no longer being consumed by the Dependencies node, which now sources them directly from the assets file. --- ...PreprocessPackageDependenciesDesignTime.cs | 102 ------------------ ...rosoft.PackageDependencyResolution.targets | 1 - 2 files changed, 103 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 72481478cc2a..96a0e60bae32 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -49,8 +49,6 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase [Required] public string TargetFrameworkMoniker { get; set; } - public ITaskItem[] InputDiagnosticMessages { get; set; } - [Output] public ITaskItem[] DependenciesDesignTime { get; set; } @@ -63,9 +61,6 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase private Dictionary Assemblies { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary DiagnosticsMap { get; } - = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary DependenciesWorld { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); @@ -84,9 +79,6 @@ protected override void ExecuteCore() PopulateAssemblies(); PopulateExistingReferenceItems(); - InputDiagnosticMessages ??= Array.Empty(); - PopulateDiagnosticsMap(); - AddDependenciesToTheWorld(Packages, PackageDependencies); AddDependenciesToTheWorld(Assemblies, FileDependencies, item => @@ -105,8 +97,6 @@ protected override void ExecuteCore() AddDependenciesToTheWorld(Assemblies, ExistingReferenceItemDependencies); - AddDependenciesToTheWorld(DiagnosticsMap, InputDiagnosticMessages); - // prepare output collection: add corresponding metadata to ITaskItem based in item type DependenciesDesignTime = DependenciesWorld.Select(itemKvp => { @@ -257,15 +247,6 @@ private void PopulateExistingReferenceItems() ExistingReferenceItemDependencies = existingReferenceItemDependencies.ToArray(); } - private void PopulateDiagnosticsMap() - { - foreach (var diagnostic in InputDiagnosticMessages) - { - var metadata = new DiagnosticMetadata(diagnostic); - DiagnosticsMap[diagnostic.ItemSpec] = metadata; - } - } - private static DependencyType GetDependencyType(string dependencyTypeString) { Enum.TryParse(dependencyTypeString, ignoreCase: true, out DependencyType dependencyType); @@ -556,89 +537,6 @@ public override ItemMetadata Clone() } } - private sealed class DiagnosticMetadata : ItemMetadata - { - public DiagnosticMetadata(ITaskItem item) - : base(DependencyType.Diagnostic) - { - DiagnosticCode = item.GetMetadata(MetadataKeys.DiagnosticCode) ?? string.Empty; - Message = item.GetMetadata(MetadataKeys.Message) ?? string.Empty; - FilePath = item.GetMetadata(MetadataKeys.FilePath) ?? string.Empty; - Severity = item.GetMetadata(MetadataKeys.Severity) ?? string.Empty; - StartLine = item.GetMetadata(MetadataKeys.StartLine) ?? string.Empty; - StartColumn = item.GetMetadata(MetadataKeys.StartColumn) ?? string.Empty; - EndLine = item.GetMetadata(MetadataKeys.EndLine) ?? string.Empty; - EndColumn = item.GetMetadata(MetadataKeys.EndColumn) ?? string.Empty; - } - - private DiagnosticMetadata( - DependencyType type, - IList dependencies, - bool isTopLevelDependency, - string diagnosticCode, - string message, - string filePath, - string severity, - string startLine, - string startColumn, - string endLine, - string endColumn) - : base(type, dependencies, isTopLevelDependency) - { - DiagnosticCode = diagnosticCode; - Message = message; - FilePath = filePath; - Severity = severity; - StartLine = startLine; - StartColumn = startColumn; - EndLine = endLine; - EndColumn = endColumn; - } - - public string DiagnosticCode { get; } - public string Message { get; } - public string FilePath { get; } - public string Severity { get; } - public string StartLine { get; } - public string StartColumn { get; } - public string EndLine { get; } - public string EndColumn { get; } - - public override IDictionary ToDictionary() - { - return new Dictionary - { - { MetadataKeys.Name, Message }, - { MetadataKeys.DiagnosticCode, DiagnosticCode }, - { MetadataKeys.Message, Message }, - { MetadataKeys.FilePath, FilePath }, - { MetadataKeys.Severity, Severity }, - { MetadataKeys.StartLine, StartLine }, - { MetadataKeys.StartColumn, StartColumn }, - { MetadataKeys.EndLine, EndLine }, - { MetadataKeys.EndColumn, EndColumn }, - { MetadataKeys.Type, Type.ToString() }, - { DependenciesMetadata, string.Join(";", Dependencies) } - }; - } - - public override ItemMetadata Clone() - { - return new DiagnosticMetadata( - Type, - Dependencies, - IsTopLevelDependency, - DiagnosticCode, - Message, - FilePath, - Severity, - StartLine, - StartColumn, - EndLine, - EndColumn); - } - } - /// /// Represents the FileDependency metadata for a Reference item that we want to pretend was /// resolved as a standard NuGet package assembly. diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index 083d70564ad7..fbc82731fac5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -310,7 +310,6 @@ Copyright (c) .NET Foundation. All rights reserved. FileDependencies="@(FileDependencies)" References="@(Reference)" DefaultImplicitPackages="$(DefaultImplicitPackages)" - InputDiagnosticMessages="@(DiagnosticMessages)" TargetFrameworkMoniker="$(NuGetTargetMoniker)"> From 4535ef63a3bf170a8c7fb620ba9b423d1eb72e16 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 10:31:10 +1100 Subject: [PATCH 689/896] Documentation --- .../PreprocessPackageDependenciesDesignTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 96a0e60bae32..bb4ca22cfa00 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -12,7 +12,7 @@ namespace Microsoft.NET.Build.Tasks { /// - /// Task combines data returned from ResolvePackageDependencies into single items collection + /// Task combines data returned from into single items collection /// that can be consumed by DesignTime build and contains all info needed to expand packages /// dependency graph. /// If any changes are made here, make sure corresponding changes are made to PackageRuleHandler From dfcbaf3b5cf9c7cf57078d111417a10682d2c704 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 10:31:39 +1100 Subject: [PATCH 690/896] Make local functions static --- src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs index f70be8866d63..a95beba36800 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs @@ -113,7 +113,7 @@ public static Dictionary GetProjectFileDependencies(this LockFil public static HashSet GetProjectFileDependencySet(this LockFile lockFile) { // Get package name from e.g. Microsoft.VSSDK.BuildTools >= 15.0.25604-Preview4 - string GetPackageNameFromDependency(string dependency) + static string GetPackageNameFromDependency(string dependency) { int indexOfWhiteSpace = IndexOfWhiteSpace(dependency); if (indexOfWhiteSpace < 0) @@ -124,7 +124,7 @@ string GetPackageNameFromDependency(string dependency) return dependency.Substring(0, indexOfWhiteSpace); } - int IndexOfWhiteSpace(string s) + static int IndexOfWhiteSpace(string s) { for (int i = 0; i < s.Length; i++) { From a3971a1d947c9f5b4a4959c45e332e066c7ef15f Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 10:44:21 +1100 Subject: [PATCH 691/896] Convert property to local variable --- .../PreprocessPackageDependenciesDesignTime.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index bb4ca22cfa00..c37d756cd27f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -64,14 +64,10 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase private Dictionary DependenciesWorld { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private HashSet ImplicitPackageReferences { get; set; } - private ITaskItem[] ExistingReferenceItemDependencies { get; set; } protected override void ExecuteCore() { - ImplicitPackageReferences = GetImplicitPackageReferences(DefaultImplicitPackages); - PopulateTargets(); PopulatePackages(); @@ -144,6 +140,8 @@ private void PopulateTargets() /// private void PopulatePackages() { + var implicitPackageReferences = GetImplicitPackageReferences(DefaultImplicitPackages); + foreach (var packageDef in PackageDefinitions) { var dependencyType = GetDependencyType(packageDef.GetMetadata(MetadataKeys.Type)); @@ -157,7 +155,7 @@ private void PopulatePackages() } var dependency = new PackageMetadata(packageDef); - dependency.IsImplicitlyDefined = ImplicitPackageReferences.Contains(dependency.Name); + dependency.IsImplicitlyDefined = implicitPackageReferences.Contains(dependency.Name); Packages[packageDef.ItemSpec] = dependency; } From 0343967bc9b6295a7b0057fb4ca1be55c7cce5a4 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 10:54:28 +1100 Subject: [PATCH 692/896] Replace O(N) with O(1) lookup --- .../PreprocessPackageDependenciesDesignTime.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index c37d756cd27f..e9f9d7400dc4 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -258,7 +258,7 @@ private void AddDependenciesToTheWorld(Dictionary items, foreach (var dependency in itemDependencies) { var currentItemId = dependency.ItemSpec; - if (!items.Keys.Contains(currentItemId)) + if (!items.ContainsKey(currentItemId)) { // if this package definition does not even exist - skip it continue; @@ -270,14 +270,14 @@ private void AddDependenciesToTheWorld(Dictionary items, } var parentTargetId = dependency.GetMetadata(MetadataKeys.ParentTarget) ?? string.Empty; - if (parentTargetId.Contains("/") || !Targets.Keys.Contains(parentTargetId)) + if (parentTargetId.Contains("/") || !Targets.ContainsKey(parentTargetId)) { // skip "target/rid"s and only consume actual targets and ignore non-existent parent targets continue; } var parentPackageId = dependency.GetMetadata(MetadataKeys.ParentPackage) ?? string.Empty; - if (!string.IsNullOrEmpty(parentPackageId) && !Packages.Keys.Contains(parentPackageId)) + if (!string.IsNullOrEmpty(parentPackageId) && !Packages.ContainsKey(parentPackageId)) { // ignore non-existent parent packages continue; From 10fce0cc3e650fd7f3b343e9baddaacaad4a51ea Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 11:21:44 +1100 Subject: [PATCH 693/896] Reduce allocation when applying item metadata --- ...PreprocessPackageDependenciesDesignTime.cs | 70 ++++++++----------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index e9f9d7400dc4..eb2b57c8ab01 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -97,11 +97,7 @@ protected override void ExecuteCore() DependenciesDesignTime = DependenciesWorld.Select(itemKvp => { var newTaskItem = new TaskItem(itemKvp.Key); - foreach (var metadataKvp in itemKvp.Value.ToDictionary()) - { - newTaskItem.SetMetadata(metadataKvp.Key, metadataKvp.Value); - } - + itemKvp.Value.SetMetadataOnTaskItem(newTaskItem); return newTaskItem; }).ToArray(); } @@ -343,10 +339,9 @@ protected ItemMetadata(DependencyType type, IList dependencies = null, b public List Dependencies { get; } /// - /// Returns name/value pairs for metadata specific to given item type's implementation. + /// Populates metadata on . /// - /// - public abstract IDictionary ToDictionary(); + public abstract void SetMetadataOnTaskItem(TaskItem taskItem); /// /// Creates a copy of the item @@ -386,17 +381,14 @@ private TargetMetadata( public string FrameworkName { get; } public string FrameworkVersion { get; } - public override IDictionary ToDictionary() + public override void SetMetadataOnTaskItem(TaskItem taskItem) { - return new Dictionary - { - { MetadataKeys.RuntimeIdentifier, RuntimeIdentifier }, - { MetadataKeys.TargetFrameworkMoniker, TargetFrameworkMoniker }, - { MetadataKeys.FrameworkName, FrameworkName }, - { MetadataKeys.FrameworkVersion, FrameworkVersion }, - { MetadataKeys.Type, Type.ToString() }, - { DependenciesMetadata, string.Join(";", Dependencies) } - }; + taskItem.SetMetadata(MetadataKeys.RuntimeIdentifier, RuntimeIdentifier); + taskItem.SetMetadata(MetadataKeys.TargetFrameworkMoniker, TargetFrameworkMoniker); + taskItem.SetMetadata(MetadataKeys.FrameworkName, FrameworkName); + taskItem.SetMetadata(MetadataKeys.FrameworkVersion, FrameworkVersion); + taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); + taskItem.SetMetadata(DependenciesMetadata, string.Join(";", Dependencies)); } public override ItemMetadata Clone() @@ -449,19 +441,16 @@ private PackageMetadata( public bool Resolved { get; } public bool IsImplicitlyDefined { get; set; } - public override IDictionary ToDictionary() + public override void SetMetadataOnTaskItem(TaskItem taskItem) { - return new Dictionary - { - { MetadataKeys.Name, Name }, - { MetadataKeys.Version, Version }, - { MetadataKeys.Path, Path }, - { MetadataKeys.Type, Type.ToString() }, - { MetadataKeys.IsImplicitlyDefined, IsImplicitlyDefined.ToString() }, - { MetadataKeys.IsTopLevelDependency, IsTopLevelDependency.ToString() }, - { ResolvedMetadata, Resolved.ToString() }, - { DependenciesMetadata, string.Join(";", Dependencies) } - }; + taskItem.SetMetadata(MetadataKeys.Name, Name); + taskItem.SetMetadata(MetadataKeys.Version, Version); + taskItem.SetMetadata(MetadataKeys.Path, Path); + taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); + taskItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, IsImplicitlyDefined.ToString()); + taskItem.SetMetadata(MetadataKeys.IsTopLevelDependency, IsTopLevelDependency.ToString()); + taskItem.SetMetadata(ResolvedMetadata, Resolved.ToString()); + taskItem.SetMetadata(DependenciesMetadata, string.Join(";", Dependencies)); } public override ItemMetadata Clone() @@ -511,19 +500,16 @@ public ExistingReferenceItemMetadata(string name, string path, bool visible) public string Path { get; } public bool Visible { get; } - public override IDictionary ToDictionary() + public override void SetMetadataOnTaskItem(TaskItem taskItem) { - return new Dictionary - { - { MetadataKeys.Name, Name }, - { MetadataKeys.Path, Path }, - { MetadataKeys.Type, Type.ToString() }, - { MetadataKeys.IsImplicitlyDefined, "false" }, - { MetadataKeys.IsTopLevelDependency, "false" }, - { ResolvedMetadata, "true" }, - { VisibleMetadata, Visible.ToString() }, - { DependenciesMetadata, string.Empty } - }; + taskItem.SetMetadata(MetadataKeys.Name, Name); + taskItem.SetMetadata(MetadataKeys.Path, Path); + taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); + taskItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, "false"); + taskItem.SetMetadata(MetadataKeys.IsTopLevelDependency, "false"); + taskItem.SetMetadata(ResolvedMetadata, "true"); + taskItem.SetMetadata(VisibleMetadata, Visible.ToString()); + taskItem.SetMetadata(DependenciesMetadata, string.Empty); } public override ItemMetadata Clone() From 78088a7e9f164fed94cc387c0753e1b80e4eaea8 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 2 Apr 2020 12:18:28 +1100 Subject: [PATCH 694/896] Remove assemblies from PreprocessPackageDependenciesDesignTime From now on, this task will only return top-level items, so we do not need to output assemblies, nor do we need to accept FileDefinitions. --- ...PreprocessPackageDependenciesDesignTime.cs | 228 +----------------- ...rosoft.PackageDependencyResolution.targets | 1 - 2 files changed, 2 insertions(+), 227 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index eb2b57c8ab01..a982611d134e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -2,9 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; using System.Collections.Generic; -using System.IO; using System.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; @@ -21,7 +19,6 @@ namespace Microsoft.NET.Build.Tasks public class PreprocessPackageDependenciesDesignTime : TaskBase { public const string DependenciesMetadata = "Dependencies"; - public const string CompileTimeAssemblyMetadata = "CompileTimeAssembly"; public const string ResolvedMetadata = "Resolved"; public const string VisibleMetadata = "Visible"; @@ -31,9 +28,6 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase [Required] public ITaskItem[] PackageDefinitions { get; set; } - [Required] - public ITaskItem[] FileDefinitions { get; set; } - [Required] public ITaskItem[] PackageDependencies { get; set; } @@ -58,41 +52,17 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase private Dictionary Packages { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary Assemblies { get; } - = new Dictionary(StringComparer.OrdinalIgnoreCase); - private Dictionary DependenciesWorld { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - private ITaskItem[] ExistingReferenceItemDependencies { get; set; } - protected override void ExecuteCore() { PopulateTargets(); PopulatePackages(); - PopulateAssemblies(); - PopulateExistingReferenceItems(); - AddDependenciesToTheWorld(Packages, PackageDependencies); - AddDependenciesToTheWorld(Assemblies, FileDependencies, item => - { - // We keep analyzers and assemblies with CompileTimeAssembly metadata; skip everything else. - - if (Assemblies.TryGetValue(item.ItemSpec, out ItemMetadata itemMetadata) && - itemMetadata.Type == DependencyType.AnalyzerAssembly) - { - return false; - } - - var fileGroup = item.GetMetadata(MetadataKeys.FileGroup); - return string.IsNullOrEmpty(fileGroup) || !fileGroup.Equals(CompileTimeAssemblyMetadata); - }); - - AddDependenciesToTheWorld(Assemblies, ExistingReferenceItemDependencies); - // prepare output collection: add corresponding metadata to ITaskItem based in item type DependenciesDesignTime = DependenciesWorld.Select(itemKvp => { @@ -157,90 +127,6 @@ private void PopulatePackages() } } - /// - /// Adds assemblies, analyzers and framework assemblies from FileDefinitions to dependencies world dictionary. - /// - private void PopulateAssemblies() - { - foreach (var fileDef in FileDefinitions) - { - var dependencyType = GetDependencyType(fileDef.GetMetadata(MetadataKeys.Type)); - if (dependencyType != DependencyType.Assembly && - dependencyType != DependencyType.FrameworkAssembly && - dependencyType != DependencyType.AnalyzerAssembly) - { - continue; - } - - var name = Path.GetFileName(fileDef.ItemSpec); - var assembly = new AssemblyMetadata(dependencyType, fileDef, name); - Assemblies[fileDef.ItemSpec] = assembly; - } - } - - /// - /// Update FileDefinitions and FileDependencies to pretend that certain Reference items - /// explicitly added by a .targets file in the NETStandard.Library are actually normal - /// package items. This allows them to show up properly under the "SDK" node in Solution - /// Explorer, rather than just under the "Assemblies" node. - /// - /// This is not meant to be a general mechanism for injecting files that can't be handled - /// through the normal NuGet package mechanisms. - /// - private void PopulateExistingReferenceItems() - { - var existingReferenceItemDependencies = new List(); - foreach (var reference in References) - { - var packageName = reference.GetMetadata(MetadataKeys.NuGetPackageId); - var packageVersion = reference.GetMetadata(MetadataKeys.NuGetPackageVersion); - - // This is not a "pre-resolved" assembly; skip it. - if (packageName == null || packageVersion == null) - { - continue; - } - - // If we don't know about the specified package, skip it. - var packageId = $"{packageName}/{packageVersion}"; - if (!Packages.TryGetValue(packageId, out ItemMetadata packageItemMetadata)) - { - continue; - } - - // If the file isn't actually a part of the package, skip it. - var packageMetadata = (PackageMetadata)packageItemMetadata; - if (!reference.ItemSpec.StartsWith(packageMetadata.Path, StringComparison.OrdinalIgnoreCase)) - { - continue; - } - - var referenceRelativePath = reference.ItemSpec.Substring(packageMetadata.Path.Length).Trim('\\'); - var referenceKey = $"{packageId}/{referenceRelativePath.Replace('\\', '/')}"; - - // If we already know about the assembly file, skip it. - if (Assemblies.TryGetValue(referenceKey, out ItemMetadata assemblyItemMetadata)) - { - continue; - } - - // Create the appropriate metadata. - var name = Path.GetFileName(referenceKey); - var facadeMetadata = reference.GetBooleanMetadata("Facade"); - var visible = facadeMetadata.HasValue ? !facadeMetadata.Value : true; - var assembly = new ExistingReferenceItemMetadata(name, reference.ItemSpec, visible); - Assemblies[referenceKey] = assembly; - - // Create the file dependency. - existingReferenceItemDependencies.Add(new ExistingReferenceItemDependency( - referenceKey, - TargetFrameworkMoniker, - packageId)); - } - - ExistingReferenceItemDependencies = existingReferenceItemDependencies.ToArray(); - } - private static DependencyType GetDependencyType(string dependencyTypeString) { Enum.TryParse(dependencyTypeString, ignoreCase: true, out DependencyType dependencyType); @@ -329,7 +215,7 @@ protected ItemMetadata(DependencyType type, IList dependencies = null, b IsTopLevelDependency = isTopLevelDependency; } - public DependencyType Type { get; protected set; } + public DependencyType Type { get; } public bool IsTopLevelDependency { get; set; } /// @@ -435,7 +321,7 @@ private PackageMetadata( IsImplicitlyDefined = isImplicitlyDefined; } - public string Name { get; protected set; } + public string Name { get; } public string Version { get; } public string Path { get; } public bool Resolved { get; } @@ -467,116 +353,6 @@ public override ItemMetadata Clone() } } - private class AssemblyMetadata : PackageMetadata - { - public AssemblyMetadata(DependencyType type, - ITaskItem item, - string name) - : base(item) - { - Name = name ?? string.Empty; - Type = type; - } - } - - /// - /// Represents metadata for a Reference item that we want to pretend was resolved as a - /// standard NuGet package assembly. - /// - private class ExistingReferenceItemMetadata : ItemMetadata - { - public ExistingReferenceItemMetadata(string name, string path, bool visible) - : base( - type: DependencyType.Assembly, - dependencies: null, - isTopLevelDependency: false) - { - Name = name; - Path = path; - Visible = visible; - } - - public string Name { get; } - public string Path { get; } - public bool Visible { get; } - - public override void SetMetadataOnTaskItem(TaskItem taskItem) - { - taskItem.SetMetadata(MetadataKeys.Name, Name); - taskItem.SetMetadata(MetadataKeys.Path, Path); - taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); - taskItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, "false"); - taskItem.SetMetadata(MetadataKeys.IsTopLevelDependency, "false"); - taskItem.SetMetadata(ResolvedMetadata, "true"); - taskItem.SetMetadata(VisibleMetadata, Visible.ToString()); - taskItem.SetMetadata(DependenciesMetadata, string.Empty); - } - - public override ItemMetadata Clone() - { - return new ExistingReferenceItemMetadata( - Name, - Path, - Visible); - } - } - - /// - /// Represents the FileDependency metadata for a Reference item that we want to pretend was - /// resolved as a standard NuGet package assembly. - /// - private sealed class ExistingReferenceItemDependency : ITaskItem - { - private readonly Dictionary _metadata = new Dictionary(capacity: 3, comparer: StringComparer.OrdinalIgnoreCase); - - public ExistingReferenceItemDependency(string itemSpec, string parentTarget, string parentPackage) - { - ItemSpec = itemSpec; - _metadata[MetadataKeys.FileGroup] = CompileTimeAssemblyMetadata; - _metadata[MetadataKeys.ParentTarget] = parentTarget; - _metadata[MetadataKeys.ParentPackage] = parentPackage; - } - - public string ItemSpec { get; set; } - - public ICollection MetadataNames => _metadata.Keys; - - public int MetadataCount => _metadata.Count; - - public IDictionary CloneCustomMetadata() - { - return new Dictionary(_metadata, _metadata.Comparer); - } - - public void CopyMetadataTo(ITaskItem destinationItem) - { - foreach (var pair in _metadata) - { - destinationItem.SetMetadata(pair.Key, pair.Value); - } - } - - public string GetMetadata(string metadataName) - { - if (_metadata.TryGetValue(metadataName, out string metadataValue)) - { - return metadataValue; - } - - return null; - } - - public void RemoveMetadata(string metadataName) - { - _metadata.Remove(metadataName); - } - - public void SetMetadata(string metadataName, string metadataValue) - { - _metadata[metadataName] = metadataValue; - } - } - internal static HashSet GetImplicitPackageReferences(string defaultImplicitPackages) { var implicitPackageReferences = new HashSet(StringComparer.OrdinalIgnoreCase); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index fbc82731fac5..cf75a0ae2974 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -305,7 +305,6 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Thu, 2 Apr 2020 20:24:42 +1100 Subject: [PATCH 695/896] Remove non-top-level packages from PreprocessPackageDependenciesDesignTime Performance work on the Dependencies node in dotnet/project-system mean that only top-level package data is needed from the design-time build. This commit removes items and metadata related to transitive dependencies and hierarchy. - Remove metadata Dependencies, which used to list child IDs - Remove metadata IsTopLevelDependency, which is now implicitly true - Remove 'target' items - Remove object cloning, now that instances are immutable --- ...PreprocessPackageDependenciesDesignTime.cs | 357 +++++------------- ...rosoft.PackageDependencyResolution.targets | 5 +- 2 files changed, 91 insertions(+), 271 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index a982611d134e..7d97cba55022 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -3,354 +3,171 @@ using System; using System.Collections.Generic; -using System.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; namespace Microsoft.NET.Build.Tasks { /// - /// Task combines data returned from into single items collection - /// that can be consumed by DesignTime build and contains all info needed to expand packages - /// dependency graph. - /// If any changes are made here, make sure corresponding changes are made to PackageRuleHandler - /// in the dotnet/project-system repo and corresponding tests. + /// Filters and projects items produced by for consumption by + /// the dependencies tree, via design-time builds. /// + /// + /// Only top-level package references are retained (i.e. those referenced directly by the project, not + /// those only brought in transitively). + /// + /// Changes to the implementation of this class must be coordinated with PackageRuleHandler + /// in the dotnet/project-system repo. + /// public class PreprocessPackageDependenciesDesignTime : TaskBase { - public const string DependenciesMetadata = "Dependencies"; public const string ResolvedMetadata = "Resolved"; - public const string VisibleMetadata = "Visible"; [Required] public ITaskItem[] TargetDefinitions { get; set; } + /// + /// Information about each package in the project, with metadata: + /// - Name = "MetadataExtractor" + /// - Path = "metadataextractor/1.0.0" + /// - ResolvedPath = "C:\Users\drnoakes\.nuget\packages\metadataextractor\1.0.0" + /// - Type = "package" + /// - Version = "2.3.0" + /// [Required] public ITaskItem[] PackageDefinitions { get; set; } + /// + /// Items with metadata "ParentTarget" and "ParentPackage", which allows determining the hierarchy of package references. + /// [Required] public ITaskItem[] PackageDependencies { get; set; } - [Required] - public ITaskItem[] FileDependencies { get; set; } - + /// + /// Eg: "Microsoft.NETCore.App;NETStandard.Library" + /// [Required] public string DefaultImplicitPackages { get; set; } - [Required] - public ITaskItem[] References { get; set; } - - [Required] - public string TargetFrameworkMoniker { get; set; } - [Output] - public ITaskItem[] DependenciesDesignTime { get; set; } - - private Dictionary Targets { get; } - = new Dictionary(StringComparer.OrdinalIgnoreCase); - - private Dictionary Packages { get; } - = new Dictionary(StringComparer.OrdinalIgnoreCase); - - private Dictionary DependenciesWorld { get; } - = new Dictionary(StringComparer.OrdinalIgnoreCase); + public ITaskItem[] DependenciesDesignTime { get; private set; } protected override void ExecuteCore() { - PopulateTargets(); - - PopulatePackages(); - - AddDependenciesToTheWorld(Packages, PackageDependencies); - - // prepare output collection: add corresponding metadata to ITaskItem based in item type - DependenciesDesignTime = DependenciesWorld.Select(itemKvp => - { - var newTaskItem = new TaskItem(itemKvp.Key); - itemKvp.Value.SetMetadataOnTaskItem(newTaskItem); - return newTaskItem; - }).ToArray(); - } - - /// - /// Adds targets from TargetDefinitions to dependencies world dictionary - /// - private void PopulateTargets() - { - foreach (var targetDef in TargetDefinitions) - { - if (string.IsNullOrEmpty(targetDef.ItemSpec) || targetDef.ItemSpec.Contains("/")) - { - // skip "target/rid"s and only consume actual targets - continue; - } - - var dependencyType = GetDependencyType(targetDef.GetMetadata(MetadataKeys.Type)); - if (dependencyType != DependencyType.Target) - { - // keep only targets here - continue; - } - - var target = new TargetMetadata(targetDef); - - Targets[targetDef.ItemSpec] = target; + var targets = GetTargets(TargetDefinitions); - // add target to the world now, since it does not have parents - DependenciesWorld[targetDef.ItemSpec] = target; - } - } - - /// - /// Adds packages from PackageDefinitions to the dependencies world dictionary. - /// - private void PopulatePackages() - { var implicitPackageReferences = GetImplicitPackageReferences(DefaultImplicitPackages); + var packageByItemSpec = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var packageDef in PackageDefinitions) { var dependencyType = GetDependencyType(packageDef.GetMetadata(MetadataKeys.Type)); - if (dependencyType != DependencyType.Package && - dependencyType != DependencyType.Unresolved) + + if (dependencyType == DependencyType.Package && + dependencyType == DependencyType.Unresolved) { - // we ignore all other dependency types since - // - assemblies we handle separately below - // - projects we don't care here, since they are sent to project system via other route - continue; + packageByItemSpec[packageDef.ItemSpec] = new PackageMetadata(packageDef, implicitPackageReferences); } - - var dependency = new PackageMetadata(packageDef); - dependency.IsImplicitlyDefined = implicitPackageReferences.Contains(dependency.Name); - - Packages[packageDef.ItemSpec] = dependency; } - } - private static DependencyType GetDependencyType(string dependencyTypeString) - { - Enum.TryParse(dependencyTypeString, ignoreCase: true, out DependencyType dependencyType); - return dependencyType; - } + var packageByUniqueId = new Dictionary(StringComparer.OrdinalIgnoreCase); - private void AddDependenciesToTheWorld(Dictionary items, - ITaskItem[] itemDependencies, - Func shouldSkipItemCheck = null) - { - foreach (var dependency in itemDependencies) + foreach (var dependency in PackageDependencies) { var currentItemId = dependency.ItemSpec; - if (!items.ContainsKey(currentItemId)) + + if (!packageByItemSpec.TryGetValue(currentItemId, out var package)) { // if this package definition does not even exist - skip it continue; } - if (shouldSkipItemCheck != null && shouldSkipItemCheck(dependency)) + if (dependency.HasMetadataValue(MetadataKeys.ParentPackage)) { + // ignore non-top-level packages (those with ParentPackage) continue; } var parentTargetId = dependency.GetMetadata(MetadataKeys.ParentTarget) ?? string.Empty; - if (parentTargetId.Contains("/") || !Targets.ContainsKey(parentTargetId)) + if (parentTargetId.IndexOf('/') != -1 || !targets.Contains(parentTargetId)) { // skip "target/rid"s and only consume actual targets and ignore non-existent parent targets continue; } - var parentPackageId = dependency.GetMetadata(MetadataKeys.ParentPackage) ?? string.Empty; - if (!string.IsNullOrEmpty(parentPackageId) && !Packages.ContainsKey(parentPackageId)) - { - // ignore non-existent parent packages - continue; - } - var currentPackageUniqueId = $"{parentTargetId}/{currentItemId}"; - // add current package to dependencies world - var currentItem = GetItem(items, currentItemId); - DependenciesWorld[currentPackageUniqueId] = currentItem; - - // update parent - var parentDependencyId = $"{parentTargetId}/{parentPackageId}".Trim('/'); - if (DependenciesWorld.TryGetValue(parentDependencyId, out ItemMetadata parentDependency)) - { - parentDependency.Dependencies.Add(currentItemId); - if (parentDependency.Type == DependencyType.Target) - { - currentItem.IsTopLevelDependency = true; - } - } - else - { - // Update parent's Dependencies count and make sure parent is in the dependencies world - if (!string.IsNullOrEmpty(parentPackageId)) - { - parentDependency = GetItem(Packages, parentPackageId); - } - else - { - parentDependency = GetItem(Targets, parentTargetId); - currentItem.IsTopLevelDependency = true; - } - - parentDependency.Dependencies.Add(currentItemId); - DependenciesWorld[parentDependencyId] = parentDependency; - } - } - - return; - - ItemMetadata GetItem(Dictionary items, string id) - { - return Targets.Count > 1 ? items[id].Clone() : items[id]; - } - } - - private abstract class ItemMetadata - { - protected ItemMetadata(DependencyType type, IList dependencies = null, bool isTopLevelDependency = false) - { - Type = type; - Dependencies = dependencies == null ? new List() : new List(dependencies); - IsTopLevelDependency = isTopLevelDependency; - } - - public DependencyType Type { get; } - public bool IsTopLevelDependency { get; set; } - - /// - /// A list of name/version strings to specify dependency identities. - /// Note: identity here is just a "name/version" and does not have TFM part in front. - /// - public List Dependencies { get; } - - /// - /// Populates metadata on . - /// - public abstract void SetMetadataOnTaskItem(TaskItem taskItem); - - /// - /// Creates a copy of the item - /// - public abstract ItemMetadata Clone(); - } - - private class TargetMetadata : ItemMetadata - { - public TargetMetadata(ITaskItem item) - : base(DependencyType.Target) - { - RuntimeIdentifier = item.GetMetadata(MetadataKeys.RuntimeIdentifier) ?? string.Empty; - TargetFrameworkMoniker = item.GetMetadata(MetadataKeys.TargetFrameworkMoniker) ?? string.Empty; - FrameworkName = item.GetMetadata(MetadataKeys.FrameworkName) ?? string.Empty; - FrameworkVersion = item.GetMetadata(MetadataKeys.FrameworkVersion) ?? string.Empty; - } - private TargetMetadata( - DependencyType type, - IList dependencies, - bool isTopLevelDependency, - string runtimeIdentifier, - string targetFrameworkMoniker, - string frameworkName, - string frameworkVersion) - : base(type, dependencies, isTopLevelDependency) - { - RuntimeIdentifier = runtimeIdentifier; - TargetFrameworkMoniker = targetFrameworkMoniker; - FrameworkName = frameworkName; - FrameworkVersion = frameworkVersion; + // add current package to dependencies world + packageByUniqueId[currentPackageUniqueId] = package; } - public string RuntimeIdentifier { get; } - public string TargetFrameworkMoniker { get; } - public string FrameworkName { get; } - public string FrameworkVersion { get; } + var outputItems = new List(packageByUniqueId.Count); - public override void SetMetadataOnTaskItem(TaskItem taskItem) + foreach (var pair in packageByUniqueId) { - taskItem.SetMetadata(MetadataKeys.RuntimeIdentifier, RuntimeIdentifier); - taskItem.SetMetadata(MetadataKeys.TargetFrameworkMoniker, TargetFrameworkMoniker); - taskItem.SetMetadata(MetadataKeys.FrameworkName, FrameworkName); - taskItem.SetMetadata(MetadataKeys.FrameworkVersion, FrameworkVersion); - taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); - taskItem.SetMetadata(DependenciesMetadata, string.Join(";", Dependencies)); + outputItems.Add(pair.Value.ToTaskItem(pair.Key)); } - public override ItemMetadata Clone() - { - return new TargetMetadata( - Type, - Dependencies, - IsTopLevelDependency, - RuntimeIdentifier, - TargetFrameworkMoniker, - FrameworkName, - FrameworkVersion); - } + DependenciesDesignTime = outputItems.ToArray(); } - private class PackageMetadata : ItemMetadata + private sealed class PackageMetadata { - public PackageMetadata(ITaskItem item) - : base(DependencyType.Package) + public PackageMetadata(ITaskItem item, HashSet implicitPackageReferences) { Name = item.GetMetadata(MetadataKeys.Name) ?? string.Empty; Version = item.GetMetadata(MetadataKeys.Version) ?? string.Empty; - Resolved = Type != DependencyType.Unknown && !string.IsNullOrEmpty(item.GetMetadata(MetadataKeys.ResolvedPath)); + Resolved = !string.IsNullOrEmpty(item.GetMetadata(MetadataKeys.ResolvedPath)); Path = (Resolved ? item.GetMetadata(MetadataKeys.ResolvedPath) : item.GetMetadata(MetadataKeys.Path)) ?? string.Empty; + IsImplicitlyDefined = implicitPackageReferences.Contains(Name); } - private PackageMetadata( - DependencyType type, - IList dependencies, - bool isTopLevelDependency, - string name, - string version, - string path, - bool resolved, - bool isImplicitlyDefined) - : base(type, dependencies, isTopLevelDependency) + private string Name { get; } + private string Version { get; } + private string Path { get; } + private bool Resolved { get; } + private bool IsImplicitlyDefined { get; } + + public ITaskItem ToTaskItem(string itemSpec) { - Name = name; - Version = version; - Path = path; - Resolved = resolved; - IsImplicitlyDefined = isImplicitlyDefined; + var outputItem = new TaskItem(itemSpec); + outputItem.SetMetadata(MetadataKeys.Name, Name); + outputItem.SetMetadata(MetadataKeys.Version, Version); + outputItem.SetMetadata(MetadataKeys.Path, Path); + outputItem.SetMetadata(MetadataKeys.Type, DependencyType.Package.ToString()); + outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, IsImplicitlyDefined.ToString()); + outputItem.SetMetadata(MetadataKeys.IsTopLevelDependency, bool.TrueString); + outputItem.SetMetadata(ResolvedMetadata, Resolved.ToString()); + return outputItem; } + } - public string Name { get; } - public string Version { get; } - public string Path { get; } - public bool Resolved { get; } - public bool IsImplicitlyDefined { get; set; } + private static HashSet GetTargets(ITaskItem[] targetDefinitions) + { + var targets = new HashSet(StringComparer.OrdinalIgnoreCase); - public override void SetMetadataOnTaskItem(TaskItem taskItem) + foreach (var targetDef in targetDefinitions) { - taskItem.SetMetadata(MetadataKeys.Name, Name); - taskItem.SetMetadata(MetadataKeys.Version, Version); - taskItem.SetMetadata(MetadataKeys.Path, Path); - taskItem.SetMetadata(MetadataKeys.Type, Type.ToString()); - taskItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, IsImplicitlyDefined.ToString()); - taskItem.SetMetadata(MetadataKeys.IsTopLevelDependency, IsTopLevelDependency.ToString()); - taskItem.SetMetadata(ResolvedMetadata, Resolved.ToString()); - taskItem.SetMetadata(DependenciesMetadata, string.Join(";", Dependencies)); - } + if (string.IsNullOrEmpty(targetDef.ItemSpec) || targetDef.ItemSpec.IndexOf('/') != -1) + { + // skip "target/rid"s and only consume actual targets + continue; + } - public override ItemMetadata Clone() - { - return new PackageMetadata( - Type, - Dependencies, - IsTopLevelDependency, - Name, - Version, - Path, - Resolved, - IsImplicitlyDefined); + var dependencyType = GetDependencyType(targetDef.GetMetadata(MetadataKeys.Type)); + if (dependencyType != DependencyType.Target) + { + // keep only targets here + continue; + } + + targets.Add(targetDef.ItemSpec); } + + return targets; } internal static HashSet GetImplicitPackageReferences(string defaultImplicitPackages) @@ -374,5 +191,11 @@ internal static HashSet GetImplicitPackageReferences(string defaultImpli return implicitPackageReferences; } + + private static DependencyType GetDependencyType(string dependencyTypeString) + { + Enum.TryParse(dependencyTypeString, ignoreCase: true, out DependencyType dependencyType); + return dependencyType; + } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index cf75a0ae2974..2a757e07cd6d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -306,10 +306,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetDefinitions="@(TargetDefinitions)" PackageDefinitions="@(PackageDefinitions)" PackageDependencies="@(PackageDependencies)" - FileDependencies="@(FileDependencies)" - References="@(Reference)" - DefaultImplicitPackages="$(DefaultImplicitPackages)" - TargetFrameworkMoniker="$(NuGetTargetMoniker)"> + DefaultImplicitPackages="$(DefaultImplicitPackages)"> From 4632176dbacce90d023cae99a5c4cca562abd96a Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 07:19:57 +1100 Subject: [PATCH 696/896] Filter DTB packages by TargetFrameworkMoniker Previously PreprocessPackageDependenciesDesignTime returned package dependencies for all targets, and PackageRuleHandler in the project system would filter based on TargetFrameworkMoniker. This change applies the filtering in this task instead. As part of this change we are now able to remove the target prefix from the item spec of output items. This reduces string allocation, improves the chance of pooling and reduces string manipulation by the consumer. --- ...PreprocessPackageDependenciesDesignTime.cs | 139 +++++++----------- ...rosoft.PackageDependencyResolution.targets | 8 +- 2 files changed, 54 insertions(+), 93 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 7d97cba55022..cb55086b2b88 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -15,6 +15,8 @@ namespace Microsoft.NET.Build.Tasks /// /// Only top-level package references are retained (i.e. those referenced directly by the project, not /// those only brought in transitively). + /// + /// Only package references applicable to are retained. /// /// Changes to the implementation of this class must be coordinated with PackageRuleHandler /// in the dotnet/project-system repo. @@ -23,9 +25,6 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase { public const string ResolvedMetadata = "Resolved"; - [Required] - public ITaskItem[] TargetDefinitions { get; set; } - /// /// Information about each package in the project, with metadata: /// - Name = "MetadataExtractor" @@ -49,125 +48,87 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase [Required] public string DefaultImplicitPackages { get; set; } + /// + /// Eg: ".NETCoreApp,Version=v5.0". + /// Only packages targeting this framework will be returned. + /// + [Required] + public string TargetFrameworkMoniker { get; set; } + [Output] - public ITaskItem[] DependenciesDesignTime { get; private set; } + public ITaskItem[] PackageDependenciesDesignTime { get; private set; } protected override void ExecuteCore() { - var targets = GetTargets(TargetDefinitions); - var implicitPackageReferences = GetImplicitPackageReferences(DefaultImplicitPackages); - var packageByItemSpec = new Dictionary(StringComparer.OrdinalIgnoreCase); - - foreach (var packageDef in PackageDefinitions) - { - var dependencyType = GetDependencyType(packageDef.GetMetadata(MetadataKeys.Type)); - - if (dependencyType == DependencyType.Package && - dependencyType == DependencyType.Unresolved) - { - packageByItemSpec[packageDef.ItemSpec] = new PackageMetadata(packageDef, implicitPackageReferences); - } - } + // We have two types of data: + // + // 1) "PackageDependencies" which place a package in a given target/hierarchy + // 2) "PackageDefinitions" which provide general metadata about a package + // + // First, we scan PackageDependencies to build the set of packages in our target. - var packageByUniqueId = new Dictionary(StringComparer.OrdinalIgnoreCase); + var allowItemSpecs = new HashSet(StringComparer.OrdinalIgnoreCase); foreach (var dependency in PackageDependencies) { - var currentItemId = dependency.ItemSpec; - - if (!packageByItemSpec.TryGetValue(currentItemId, out var package)) - { - // if this package definition does not even exist - skip it - continue; - } - if (dependency.HasMetadataValue(MetadataKeys.ParentPackage)) { // ignore non-top-level packages (those with ParentPackage) continue; } - var parentTargetId = dependency.GetMetadata(MetadataKeys.ParentTarget) ?? string.Empty; - if (parentTargetId.IndexOf('/') != -1 || !targets.Contains(parentTargetId)) + var target = dependency.GetMetadata(MetadataKeys.ParentTarget); + + if (!StringComparer.OrdinalIgnoreCase.Equals(target, TargetFrameworkMoniker)) { - // skip "target/rid"s and only consume actual targets and ignore non-existent parent targets + // skip dependencies for other targets continue; } - var currentPackageUniqueId = $"{parentTargetId}/{currentItemId}"; - - // add current package to dependencies world - packageByUniqueId[currentPackageUniqueId] = package; - } - - var outputItems = new List(packageByUniqueId.Count); - - foreach (var pair in packageByUniqueId) - { - outputItems.Add(pair.Value.ToTaskItem(pair.Key)); - } - - DependenciesDesignTime = outputItems.ToArray(); - } - - private sealed class PackageMetadata - { - public PackageMetadata(ITaskItem item, HashSet implicitPackageReferences) - { - Name = item.GetMetadata(MetadataKeys.Name) ?? string.Empty; - Version = item.GetMetadata(MetadataKeys.Version) ?? string.Empty; - Resolved = !string.IsNullOrEmpty(item.GetMetadata(MetadataKeys.ResolvedPath)); - Path = (Resolved - ? item.GetMetadata(MetadataKeys.ResolvedPath) - : item.GetMetadata(MetadataKeys.Path)) ?? string.Empty; - IsImplicitlyDefined = implicitPackageReferences.Contains(Name); + allowItemSpecs.Add(dependency.ItemSpec); } - private string Name { get; } - private string Version { get; } - private string Path { get; } - private bool Resolved { get; } - private bool IsImplicitlyDefined { get; } + // Second, find PackageDefinitions that match our allowed item specs - public ITaskItem ToTaskItem(string itemSpec) - { - var outputItem = new TaskItem(itemSpec); - outputItem.SetMetadata(MetadataKeys.Name, Name); - outputItem.SetMetadata(MetadataKeys.Version, Version); - outputItem.SetMetadata(MetadataKeys.Path, Path); - outputItem.SetMetadata(MetadataKeys.Type, DependencyType.Package.ToString()); - outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, IsImplicitlyDefined.ToString()); - outputItem.SetMetadata(MetadataKeys.IsTopLevelDependency, bool.TrueString); - outputItem.SetMetadata(ResolvedMetadata, Resolved.ToString()); - return outputItem; - } - } + var outputItems = new List(allowItemSpecs.Count); - private static HashSet GetTargets(ITaskItem[] targetDefinitions) - { - var targets = new HashSet(StringComparer.OrdinalIgnoreCase); - - foreach (var targetDef in targetDefinitions) + foreach (var packageDef in PackageDefinitions) { - if (string.IsNullOrEmpty(targetDef.ItemSpec) || targetDef.ItemSpec.IndexOf('/') != -1) + if (!allowItemSpecs.Contains(packageDef.ItemSpec)) { - // skip "target/rid"s and only consume actual targets + // We are not interested in this definition (not top-level, or wrong target) continue; } - var dependencyType = GetDependencyType(targetDef.GetMetadata(MetadataKeys.Type)); - if (dependencyType != DependencyType.Target) + var dependencyType = GetDependencyType(packageDef.GetMetadata(MetadataKeys.Type)); + + if (dependencyType == DependencyType.Package || + dependencyType == DependencyType.Unresolved) { - // keep only targets here - continue; + var name = packageDef.GetMetadata(MetadataKeys.Name) ?? string.Empty; + var version = packageDef.GetMetadata(MetadataKeys.Version) ?? string.Empty; + var resolved = !string.IsNullOrEmpty(packageDef.GetMetadata(MetadataKeys.ResolvedPath)); + var path = (resolved + ? packageDef.GetMetadata(MetadataKeys.ResolvedPath) + : packageDef.GetMetadata(MetadataKeys.Path)) ?? string.Empty; + var isImplicitlyDefined = implicitPackageReferences.Contains(name); + + var outputItem = new TaskItem(packageDef.ItemSpec); + outputItem.SetMetadata(MetadataKeys.Name, name); + outputItem.SetMetadata(MetadataKeys.Version, version); + outputItem.SetMetadata(MetadataKeys.Path, path); + outputItem.SetMetadata(MetadataKeys.Type, DependencyType.Package.ToString()); + outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, isImplicitlyDefined.ToString()); + outputItem.SetMetadata(MetadataKeys.IsTopLevelDependency, bool.TrueString); + outputItem.SetMetadata(ResolvedMetadata, resolved.ToString()); + + outputItems.Add(outputItem); } - - targets.Add(targetDef.ItemSpec); } - return targets; + PackageDependenciesDesignTime = outputItems.ToArray(); } internal static HashSet GetImplicitPackageReferences(string defaultImplicitPackages) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index 2a757e07cd6d..f5d1fd8b2145 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -299,16 +299,16 @@ Copyright (c) .NET Foundation. All rights reserved. AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" /> + DefaultImplicitPackages="$(DefaultImplicitPackages)" + TargetFrameworkMoniker="$(NuGetTargetMoniker)"> - + From aa3947ce29f3047c82dd818bdfa2e6d1becd53cb Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 07:21:02 +1100 Subject: [PATCH 697/896] Don't set IsTopLevelDependency metadata This metadata always has 'true' as its value. We can infer this in the project system. --- .../PreprocessPackageDependenciesDesignTime.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index cb55086b2b88..384545c7f8a2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -121,7 +121,6 @@ protected override void ExecuteCore() outputItem.SetMetadata(MetadataKeys.Path, path); outputItem.SetMetadata(MetadataKeys.Type, DependencyType.Package.ToString()); outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, isImplicitlyDefined.ToString()); - outputItem.SetMetadata(MetadataKeys.IsTopLevelDependency, bool.TrueString); outputItem.SetMetadata(ResolvedMetadata, resolved.ToString()); outputItems.Add(outputItem); From 455892ad67ab543a9d04027e38cd0f6d1c2e8c95 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 07:47:43 +1100 Subject: [PATCH 698/896] Don't set Type metadata This metadata always has 'Package' as its value. We can infer this in the project system. --- .../PreprocessPackageDependenciesDesignTime.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 384545c7f8a2..285616c172ba 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -119,7 +119,6 @@ protected override void ExecuteCore() outputItem.SetMetadata(MetadataKeys.Name, name); outputItem.SetMetadata(MetadataKeys.Version, version); outputItem.SetMetadata(MetadataKeys.Path, path); - outputItem.SetMetadata(MetadataKeys.Type, DependencyType.Package.ToString()); outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, isImplicitlyDefined.ToString()); outputItem.SetMetadata(ResolvedMetadata, resolved.ToString()); From b286e4b972e401a94a31503b0141a5125b44d035 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 07:58:34 +1100 Subject: [PATCH 699/896] Require Name for DTB resolved package reference items --- .../PreprocessPackageDependenciesDesignTime.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 285616c172ba..282ac3488b1b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -107,7 +107,14 @@ protected override void ExecuteCore() if (dependencyType == DependencyType.Package || dependencyType == DependencyType.Unresolved) { - var name = packageDef.GetMetadata(MetadataKeys.Name) ?? string.Empty; + var name = packageDef.GetMetadata(MetadataKeys.Name); + + if (string.IsNullOrEmpty(name)) + { + // Name is required + continue; + } + var version = packageDef.GetMetadata(MetadataKeys.Version) ?? string.Empty; var resolved = !string.IsNullOrEmpty(packageDef.GetMetadata(MetadataKeys.ResolvedPath)); var path = (resolved From 24672f7e1c6786580a94ed5903b699d7844f256e Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 07:58:55 +1100 Subject: [PATCH 700/896] Extract var for common subexpression --- .../PreprocessPackageDependenciesDesignTime.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 282ac3488b1b..5e9fe997a33b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -116,9 +116,10 @@ protected override void ExecuteCore() } var version = packageDef.GetMetadata(MetadataKeys.Version) ?? string.Empty; - var resolved = !string.IsNullOrEmpty(packageDef.GetMetadata(MetadataKeys.ResolvedPath)); + var resolvedPath = packageDef.GetMetadata(MetadataKeys.ResolvedPath); + var resolved = !string.IsNullOrEmpty(resolvedPath); var path = (resolved - ? packageDef.GetMetadata(MetadataKeys.ResolvedPath) + ? resolvedPath : packageDef.GetMetadata(MetadataKeys.Path)) ?? string.Empty; var isImplicitlyDefined = implicitPackageReferences.Contains(name); From a515ab913cdaa4ca126df76d7447c06e8ebec084 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 3 Apr 2020 20:53:43 +1100 Subject: [PATCH 701/896] Update unit tests for PreprocessPackageDependenciesDesignTime --- ...WantToGetDependenciesViaDesignTimeBuild.cs | 1587 ++++------------- 1 file changed, 339 insertions(+), 1248 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs index 8d94925b5ec6..a3140e0531fc 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs @@ -2,8 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; -using System.Linq; -using FluentAssertions; using Microsoft.Build.Framework; using Xunit; @@ -11,1296 +9,389 @@ namespace Microsoft.NET.Build.Tasks.UnitTests { public class GivenThatWeWantToGetDependenciesViaDesignTimeBuild { - [Fact] - public void ItShouldReturnOnlyValidTargetsWithoutRIDs() - { - // Arrange - // target definitions - var mockTargetWithType = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "target" } // lower case just in case - }); - - var mockTargetWithRidToBeSkipped = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5/win7x86", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "" }, - { MetadataKeys.TargetFrameworkMoniker, "" }, - { MetadataKeys.FrameworkName, "" }, - { MetadataKeys.FrameworkVersion, "" }, - { MetadataKeys.Type, ""} - }); - - var mockTargetWithoutType = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.6", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net46" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.6" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.6" }, - }); - - var mockTargetWithEmptyItemSpecToBeSkipped = new MockTaskItem( - itemSpec: "", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "" }, - { MetadataKeys.TargetFrameworkMoniker, "" }, - { MetadataKeys.FrameworkName, "" }, - { MetadataKeys.FrameworkVersion, "" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { - mockTargetWithType, - mockTargetWithRidToBeSkipped, - mockTargetWithoutType, - mockTargetWithEmptyItemSpecToBeSkipped - }; - task.PackageDefinitions = new ITaskItem[] { }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(1); - - var resultTargetsWithType = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargetsWithType.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTargetWithType, resultTargetsWithType[0]); - } - [Fact] public void ItShouldNotReturnPackagesWithUnknownTypes() { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackageNoType = new MockTaskItem( - itemSpec: "mockPackageNoType/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageNoType" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some path" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageUnknown = new MockTaskItem( - itemSpec: "mockPackageUnknown/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageUnknown" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "qqqq" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - // package dependencies - var mockPackageDepNoType = new MockTaskItem( - itemSpec: "mockPackageNoType/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageDepUnknown = new MockTaskItem( - itemSpec: "mockPackageUnknown/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { mockPackageNoType, mockPackageUnknown }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { mockPackageDepNoType, mockPackageDepUnknown }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - - // Act - var result = task.Execute(); + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = string.Empty, + PackageDefinitions = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "mockPackageNoType/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageNoType" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some path" } + }), + new MockTaskItem( + itemSpec: "mockPackageUnknown/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageUnknown" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "qqqq" } + }) + }, + PackageDependencies = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "mockPackageNoType/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageUnknown/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }) + } + }; - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(1); + Assert.True(task.Execute()); - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); + Assert.Empty(task.PackageDependenciesDesignTime); } [Fact] public void ItShouldReturnUnresolvedPackageDependenciesWithTypePackage() { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackageUnresolved = new MockTaskItem( - itemSpec: "mockPackageUnresolved/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageUnresolved" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "" }, - { MetadataKeys.Type, "Unresolved" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - // package dependencies - var mockPackageDepUnresolved = new MockTaskItem( - itemSpec: "mockPackageUnresolved/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { mockPackageUnresolved }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { mockPackageDepUnresolved }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(2); - - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); - - var resultPackageUnresolved = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/mockPackageUnresolved/1.0.0")).ToArray(); - resultPackageUnresolved.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockPackageUnresolved, resultPackageUnresolved[0]); - } - - [Fact] - public void ItShouldIgnoreAllDependenciesWithTypeNotEqualToPackageOrUnresolved() - { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackageExternalProject = new MockTaskItem( - itemSpec: "mockPackageExternalProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageExternalProject" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some path" }, - { MetadataKeys.Type, "ExternalProject" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageProject = new MockTaskItem( - itemSpec: "mockPackageProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageProject" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Project" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageContent = new MockTaskItem( - itemSpec: "mockPackageContent/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageContent" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Content" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageAssembly = new MockTaskItem( - itemSpec: "mockPackageAssembly/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageAssembly" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Assembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageFrameworkAssembly = new MockTaskItem( - itemSpec: "mockPackageFrameworkAssembly/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageFrameworkAssembly" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "FrameworkAssembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageDiagnostic = new MockTaskItem( - itemSpec: "mockPackageDiagnostic/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageDiagnostic" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Diagnostic" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageWinmd = new MockTaskItem( - itemSpec: "mockPackageWinmd/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageWinmd" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Winmd" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackageReference = new MockTaskItem( - itemSpec: "mockPackageReference/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockPackageReference" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Reference" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - // package dependencies - var mockPackageExternalProjectDep = new MockTaskItem( - itemSpec: "mockPackageExternalProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageProjectDep = new MockTaskItem( - itemSpec: "mockPackageProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageContentDep = new MockTaskItem( - itemSpec: "mockPackageContent/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageAssemblyDep = new MockTaskItem( - itemSpec: "mockPackageAssembly/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageFrameworkAssemblyDep = new MockTaskItem( - itemSpec: "mockPackageFrameworkAssembly/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageDiagnosticDep = new MockTaskItem( - itemSpec: "mockPackageDiagnostic/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageWinmdDep = new MockTaskItem( - itemSpec: "mockPackageWinmd/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageReferenceDep = new MockTaskItem( - itemSpec: "mockPackageReference/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { - mockPackageExternalProject, - mockPackageProject, - mockPackageContent, - mockPackageAssembly, - mockPackageFrameworkAssembly, - mockPackageWinmd, - mockPackageReference - }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { - mockPackageExternalProjectDep, - mockPackageProjectDep, - mockPackageContentDep, - mockPackageAssemblyDep, - mockPackageFrameworkAssemblyDep, - mockPackageWinmdDep, - mockPackageReferenceDep + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = string.Empty, + PackageDefinitions = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "mockPackageUnresolved/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageUnresolved" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "" }, + { MetadataKeys.Type, "Unresolved" } + }) + }, + PackageDependencies = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "mockPackageUnresolved/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }) + } }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - // Act - var result = task.Execute(); + Assert.True(task.Execute()); - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(1); + var item = Assert.Single(task.PackageDependenciesDesignTime); - // Target with type - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); + Assert.Equal("mockPackageUnresolved/1.0.0", item.ItemSpec); + Assert.Equal("mockPackageUnresolved", item.GetMetadata(MetadataKeys.Name)); + Assert.Equal("1.0.0", item.GetMetadata(MetadataKeys.Version)); + Assert.Equal("some path", item.GetMetadata(MetadataKeys.Path)); + Assert.Equal("", item.GetMetadata(MetadataKeys.ResolvedPath)); + Assert.False(item.GetBooleanMetadata(MetadataKeys.IsImplicitlyDefined)); + Assert.False(item.GetBooleanMetadata(PreprocessPackageDependenciesDesignTime.ResolvedMetadata)); } [Fact] - public void ItReturnsCorrectHierarchyOfDependenciesThatHaveChildren() + public void ItShouldIdentifyDefaultImplicitPackages() { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackage = new MockTaskItem( - itemSpec: "Package3/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "Package3" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { PreprocessPackageDependenciesDesignTime.DependenciesMetadata, "ChildPackage1/1.0.0;ChildPackage2/2.0.0" }, - { MetadataKeys.IsTopLevelDependency, "True" } - }); - - var mockChildPackage1 = new MockTaskItem( - itemSpec: "ChildPackage1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "ChildPackage1" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { PreprocessPackageDependenciesDesignTime.DependenciesMetadata, "ChildPackage11/1.0.0" }, - { MetadataKeys.IsTopLevelDependency, "False" } - }); - - var mockChildPackage11 = new MockTaskItem( - itemSpec: "ChildPackage11/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "ChildPackage11" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { MetadataKeys.IsTopLevelDependency, "False" } - }); - - var mockChildPackage2 = new MockTaskItem( - itemSpec: "ChildPackage2/2.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "ChildPackage2" }, - { MetadataKeys.Version, "2.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { MetadataKeys.IsTopLevelDependency, "False" } - }); - - // package dependencies - var mockPackageDep = new MockTaskItem( - itemSpec: "Package3/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockChildPackageDep1 = new MockTaskItem( - itemSpec: "ChildPackage1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" } - }); - - var mockChildPackageDep11 = new MockTaskItem( - itemSpec: "ChildPackage11/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "ChildPackage1/1.0.0" } - }); - - var mockChildPackageDep2 = new MockTaskItem( - itemSpec: "ChildPackage2/2.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { - mockPackage, - mockChildPackage1, - mockChildPackage11, - mockChildPackage2 - }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { - mockPackageDep, - mockChildPackageDep1, - mockChildPackageDep11, - mockChildPackageDep2 + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = "DefaultImplicit", + PackageDefinitions = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "DefaultImplicit/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "DefaultImplicit" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "" }, + { MetadataKeys.Type, "Package" } + }) + }, + PackageDependencies = new ITaskItem[] + { + new MockTaskItem( + itemSpec: "DefaultImplicit/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }) + } }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(5); - - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); - mockPackage.SetMetadata(MetadataKeys.Path, mockPackage.GetMetadata(MetadataKeys.ResolvedPath)); - var resultPackage = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/Package3/1.0.0")).ToArray(); - resultPackage.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockPackage, resultPackage[0]); + Assert.True(task.Execute()); - mockChildPackage1.SetMetadata(MetadataKeys.Path, mockChildPackage1.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildPackage1 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/ChildPackage1/1.0.0")).ToArray(); - resultChildPackage1.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockChildPackage1, resultChildPackage1[0]); + var item = Assert.Single(task.PackageDependenciesDesignTime); - mockChildPackage11.SetMetadata(MetadataKeys.Path, mockChildPackage11.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildPackage11 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/ChildPackage11/1.0.0")).ToArray(); - resultChildPackage11.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockChildPackage11, resultChildPackage11[0]); - - mockChildPackage2.SetMetadata(MetadataKeys.Path, mockChildPackage2.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildPackage2 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/ChildPackage2/2.0.0")).ToArray(); - resultChildPackage2.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockChildPackage2, resultChildPackage2[0]); + Assert.Equal("DefaultImplicit/1.0.0", item.ItemSpec); + Assert.True(item.GetBooleanMetadata(MetadataKeys.IsImplicitlyDefined)); } [Fact] - public void ItShouldIgnoreFileDependenciesThatAre_NotAssemblies_And_DontBelongToCompileTimeAssemblyGroup() + public void ItShouldIgnoreAllDependenciesWithTypeNotEqualToPackageOrUnresolved() { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockExternalProject = new MockTaskItem( - itemSpec: "mockExternalProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockExternalProject" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some path" }, - { MetadataKeys.Type, "ExternalProject" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockProject = new MockTaskItem( - itemSpec: "mockProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockProject" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Project" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockContent = new MockTaskItem( - itemSpec: "mockContent/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockContent" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Content" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockPackage = new MockTaskItem( - itemSpec: "mockPackage/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockAssembly" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Assembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockDiagnostic = new MockTaskItem( - itemSpec: "mockDiagnostic/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockDiagnostic" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Diagnostic" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockWinmd = new MockTaskItem( - itemSpec: "mockWinmd/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockWinmd" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Winmd" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - var mockReference = new MockTaskItem( - itemSpec: "mockReference/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockReference" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Reference" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "False" } - }); - - // package dependencies - var mockExternalProjectDep = new MockTaskItem( - itemSpec: "mockExternalProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockProjectDep = new MockTaskItem( - itemSpec: "mockProject/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockContentDep = new MockTaskItem( - itemSpec: "mockContent/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageDep = new MockTaskItem( - itemSpec: "mockPackage/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockDiagnosticDep = new MockTaskItem( - itemSpec: "mockDiagnostic/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockWinmdDep = new MockTaskItem( - itemSpec: "mockWinmd/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockReferenceDep = new MockTaskItem( - itemSpec: "mockReference/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { }; - task.FileDefinitions = new ITaskItem[] { - mockExternalProject, - mockProject, - mockContent, - mockPackage, - mockWinmd, - mockReference - }; - task.PackageDependencies = new ITaskItem[] { }; - task.FileDependencies = new ITaskItem[] { - mockExternalProjectDep, - mockProjectDep, - mockContentDep, - mockPackageDep, - mockWinmdDep, - mockReferenceDep + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = string.Empty, + PackageDefinitions = new ITaskItem[] { + new MockTaskItem( + itemSpec: "mockPackageExternalProject/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageExternalProject" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some path" }, + { MetadataKeys.Type, "ExternalProject" } + }), + new MockTaskItem( + itemSpec: "mockPackageProject/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageProject" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Project" } + }), + new MockTaskItem( + itemSpec: "mockPackageContent/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageContent" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Content" } + }), + new MockTaskItem( + itemSpec: "mockPackageAssembly/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageAssembly" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Assembly" } + }), + new MockTaskItem( + itemSpec: "mockPackageFrameworkAssembly/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageFrameworkAssembly" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "FrameworkAssembly" } + }), + new MockTaskItem( + itemSpec: "mockPackageDiagnostic/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageDiagnostic" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Diagnostic" } + }), + new MockTaskItem( + itemSpec: "mockPackageWinmd/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageWinmd" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Winmd" } + }), + new MockTaskItem( + itemSpec: "mockPackageReference/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "mockPackageReference" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Reference" } + }) + }, + PackageDependencies = new ITaskItem[] { + new MockTaskItem( + itemSpec: "mockPackageExternalProject/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageProject/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageContent/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageAssembly/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageFrameworkAssembly/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageDiagnostic/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageWinmd/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "mockPackageReference/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }) + } }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; - // Act - var result = task.Execute(); + Assert.True(task.Execute()); - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(1); - - // Target with type - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); + Assert.Empty(task.PackageDependenciesDesignTime); } [Fact] - public void ItShouldReturnCorrectHierarchyWhenPackageHasChildAssemblyOrAnalyzerDependencies() + public void ItShouldOnlyReturnPackagesInTheSpecifiedTarget() { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackage = new MockTaskItem( - itemSpec: "Package3/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "Package3" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { PreprocessPackageDependenciesDesignTime.DependenciesMetadata, - @"mockChildAssembly1;somepath/mockChildAssembly2;somepath/mockChildAnalyzerAssembly" }, - { MetadataKeys.IsImplicitlyDefined, "True" } - }); - - var mockPackage4 = new MockTaskItem( - itemSpec: "Package4/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "Package4" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { MetadataKeys.IsImplicitlyDefined, "True" } - }); - - var mockChildAssembly1 = new MockTaskItem( - itemSpec: @"mockChildAssembly1", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockChildAssembly1" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Assembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - var mockChildAssembly2 = new MockTaskItem( - itemSpec: @"somepath/mockChildAssembly2", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockChildAssembly2" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "FrameworkAssembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - var mockChildAssemblyNoCompileMetadata = new MockTaskItem( - itemSpec: @"somepath/mockChildAssemblyNoCompileMetadata", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockChildAssemblyNoCompileMetadata" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Assembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - var mockChildAnalyzerAssembly = new MockTaskItem( - itemSpec: @"somepath/mockChildAnalyzerAssembly", - metadata: new Dictionary - { - { MetadataKeys.Name, "mockChildAnalyzerAssembly" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "AnalyzerAssembly" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - // package dependencies - var mockPackageDep = new MockTaskItem( - itemSpec: "Package3/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockPackageDep4 = new MockTaskItem( - itemSpec: "Package4/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockChildAssemblyDep1 = new MockTaskItem( - itemSpec: "mockChildAssembly1", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" }, - { MetadataKeys.FileGroup, PreprocessPackageDependenciesDesignTime.CompileTimeAssemblyMetadata } - }); - - var mockChildAssemblyDep2 = new MockTaskItem( - itemSpec: @"somepath/mockChildAssembly2", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" }, - { MetadataKeys.FileGroup, PreprocessPackageDependenciesDesignTime.CompileTimeAssemblyMetadata } - }); - - var mockChildAssemblyNoCompileMetadataDep = new MockTaskItem( - itemSpec: "somepath/mockChildAssemblyNoCompileMetadata", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" } - }); - - var mockChildAnalyzerAssemblyDep = new MockTaskItem( - itemSpec: "somepath/mockChildAnalyzerAssembly", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package3/1.0.0" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget }; - task.PackageDefinitions = new ITaskItem[] { - mockPackage, - mockPackage4 - }; - task.FileDefinitions = new ITaskItem[] { - mockChildAssembly1, - mockChildAssembly2, - mockChildAssemblyNoCompileMetadata, - mockChildAnalyzerAssembly - }; - task.PackageDependencies = new ITaskItem[] { - mockPackageDep, - mockPackageDep4 - }; - task.FileDependencies = new ITaskItem[] { - mockChildAssemblyDep1, - mockChildAssemblyDep2, - mockChildAssemblyNoCompileMetadataDep, - mockChildAnalyzerAssemblyDep + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = string.Empty, + PackageDefinitions = new ITaskItem[] { + new MockTaskItem( + itemSpec: "Package1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "Package1" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "" }, + { MetadataKeys.Type, "Package" } + }), + new MockTaskItem( + itemSpec: "Package2/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "Package2" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "" }, + { MetadataKeys.Type, "Package" } + }) + }, + PackageDependencies = new ITaskItem[] { + new MockTaskItem( + itemSpec: "Package1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "Package2/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.6" } + }) + } }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = "Package3;Package4"; - task.TargetFrameworkMoniker = string.Empty; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(6); - - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Target, mockTarget, resultTargets[0]); - - mockPackage.SetMetadata(MetadataKeys.Path, mockPackage.GetMetadata(MetadataKeys.ResolvedPath)); - var resultPackage = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/Package3/1.0.0")).ToArray(); - resultPackage.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockPackage, resultPackage[0]); - - mockPackage4.SetMetadata(MetadataKeys.Path, mockPackage4.GetMetadata(MetadataKeys.ResolvedPath)); - var resultPackage4 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/Package4/1.0.0")).ToArray(); - resultPackage4.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Package, mockPackage4, resultPackage4[0]); - - mockChildAssembly1.SetMetadata(MetadataKeys.Path, mockChildAssembly1.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildAssembly1 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/mockChildAssembly1")).ToArray(); - resultChildAssembly1.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.Assembly, mockChildAssembly1, resultChildAssembly1[0]); - - mockChildAssembly2.SetMetadata(MetadataKeys.Path, mockChildAssembly2.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildAssembly2 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/somepath/mockChildAssembly2")).ToArray(); - resultChildAssembly2.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.FrameworkAssembly, mockChildAssembly2, resultChildAssembly2[0]); - - mockChildAnalyzerAssembly.SetMetadata(MetadataKeys.Path, mockChildAnalyzerAssembly.GetMetadata(MetadataKeys.ResolvedPath)); - var resultChildAnalyzerAssembly = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/somepath/mockChildAnalyzerAssembly")).ToArray(); - resultChildAnalyzerAssembly.Length.Should().Be(1); - VerifyTargetTaskItem(DependencyType.AnalyzerAssembly, mockChildAnalyzerAssembly, resultChildAnalyzerAssembly[0]); - } - - [Fact] - public void ItShouldReturnCorrectPackagesForCorrespondingTarget() - { - // Arrange - // target definitions - var mockTarget = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.5", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net45" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.5" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.5" }, - { MetadataKeys.Type, "Target" } - }); - - var mockTarget2 = new MockTaskItem( - itemSpec: ".Net Framework,Version=v4.6", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "net46" }, - { MetadataKeys.TargetFrameworkMoniker, ".Net Framework,Version=v4.6" }, - { MetadataKeys.FrameworkName, ".Net Framework" }, - { MetadataKeys.FrameworkVersion, "4.6" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var mockPackage1 = new MockTaskItem( - itemSpec: "Package1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "Package1" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - var mockChildPackage1 = new MockTaskItem( - itemSpec: "ChildPackage1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "ChildPackage1" }, - { MetadataKeys.Version, "1.0.0" }, - { MetadataKeys.Path, "some path" }, - { MetadataKeys.ResolvedPath, "some resolved path" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" }, - { MetadataKeys.IsTopLevelDependency, "False" } - }); - - // package dependencies - var mockPackageDep1 = new MockTaskItem( - itemSpec: "Package1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } - }); - - var mockChildPackageDep1 = new MockTaskItem( - itemSpec: "ChildPackage1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, - { MetadataKeys.ParentPackage, "Package1/1.0.0" } - }); - - var mockPackageDep2 = new MockTaskItem( - itemSpec: "Package1/1.0.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.6" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { mockTarget, mockTarget2 }; - task.PackageDefinitions = new ITaskItem[] { mockPackage1, mockChildPackage1 }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { mockPackageDep1, mockPackageDep2, mockChildPackageDep1 }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = string.Empty; + Assert.True(task.Execute()); - // Act - var result = task.Execute(); + var item = Assert.Single(task.PackageDependenciesDesignTime); - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(5); - - var resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5")).ToArray(); - resultTargets.Length.Should().Be(1); - - resultTargets = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.6")).ToArray(); - resultTargets.Length.Should().Be(1); - - var resultPackage1 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.5/Package1/1.0.0")).ToArray(); - resultPackage1.Length.Should().Be(1); - resultPackage1[0].GetMetadata(PreprocessPackageDependenciesDesignTime.DependenciesMetadata) - .Should().Be("ChildPackage1/1.0.0"); - - resultPackage1 = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".Net Framework,Version=v4.6/Package1/1.0.0")).ToArray(); - resultPackage1.Length.Should().Be(1); - resultPackage1[0].GetMetadata(PreprocessPackageDependenciesDesignTime.DependenciesMetadata) - .Should().Be(""); + Assert.Equal("Package1/1.0.0", item.ItemSpec); } [Fact] - public void ItShouldCreateDependenciesForReferencesWithNuGetMetadata() + public void ItShouldOnlyReturnTopLevelPackages() { - // Arrange - // target definitions - var netStandard20Target = new MockTaskItem( - itemSpec: ".NETStandard,Version=v2.0", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "netstandard2.0" }, - { MetadataKeys.TargetFrameworkMoniker, ".NETStandard,Version=v2.0" }, - { MetadataKeys.FrameworkName, ".NETStandard" }, - { MetadataKeys.FrameworkVersion, "2.0" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var myPackage = new MockTaskItem( - itemSpec: "MyPackage/1.5.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "MyPackage" }, - { MetadataKeys.Version, "1.5.0" }, - { MetadataKeys.Path, "Packages\\MyPackage\\1.5.0" }, - { MetadataKeys.ResolvedPath, "" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - // package dependencies - var myPackageDependency = new MockTaskItem( - itemSpec: "MyPackage/1.5.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".NETStandard,Version=v2.0" } - }); - - // references - var referenceWithMetadata = new MockTaskItem( - itemSpec: "Packages\\MyPackage\\1.5.0\\AnAssembly.dll", - metadata: new Dictionary - { - { "NuGetPackageId", "MyPackage" }, - { "NuGetPackageVersion", "1.5.0" } - }); - - var referenceWithoutMetadata = new MockTaskItem( - itemSpec: "Packages\\MyPackage\\1.5.0\\AnotherAssembly.dll", - metadata: new Dictionary()); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { netStandard20Target }; - task.PackageDefinitions = new ITaskItem[] { myPackage }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { myPackageDependency }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { referenceWithMetadata, referenceWithoutMetadata }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = ".NETStandard,Version=v2.0"; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(3); - - var resultPackage = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".NETStandard,Version=v2.0/MyPackage/1.5.0")).ToArray(); - resultPackage.Length.Should().Be(1); - resultPackage[0].GetMetadata(PreprocessPackageDependenciesDesignTime.DependenciesMetadata) - .Should().Be("MyPackage/1.5.0/AnAssembly.dll"); - } - - [Fact] - public void ItShouldMakeFacadeReferencesInvisible() - { - // Arrange - // target definitions - var netStandard20Target = new MockTaskItem( - itemSpec: ".NETStandard,Version=v2.0", - metadata: new Dictionary - { - { MetadataKeys.RuntimeIdentifier, "netstandard2.0" }, - { MetadataKeys.TargetFrameworkMoniker, ".NETStandard,Version=v2.0" }, - { MetadataKeys.FrameworkName, ".NETStandard" }, - { MetadataKeys.FrameworkVersion, "2.0" }, - { MetadataKeys.Type, "Target" } - }); - - // package definitions - var myPackage = new MockTaskItem( - itemSpec: "MyPackage/1.5.0", - metadata: new Dictionary - { - { MetadataKeys.Name, "MyPackage" }, - { MetadataKeys.Version, "1.5.0" }, - { MetadataKeys.Path, "Packages\\MyPackage\\1.5.0" }, - { MetadataKeys.ResolvedPath, "" }, - { MetadataKeys.Type, "Package" }, - { PreprocessPackageDependenciesDesignTime.ResolvedMetadata, "True" } - }); - - // package dependencies - var myPackageDependency = new MockTaskItem( - itemSpec: "MyPackage/1.5.0", - metadata: new Dictionary - { - { MetadataKeys.ParentTarget, ".NETStandard,Version=v2.0" } - }); - - // references - var alphaReference = new MockTaskItem( - itemSpec: "Packages\\MyPackage\\1.5.0\\AlphaAssembly.dll", - metadata: new Dictionary - { - { "NuGetPackageId", "MyPackage" }, - { "NuGetPackageVersion", "1.5.0" } - }); - - var betaReference = new MockTaskItem( - itemSpec: "Packages\\MyPackage\\1.5.0\\BetaAssembly.dll", - metadata: new Dictionary - { - { "NuGetPackageId", "MyPackage" }, - { "NuGetPackageVersion", "1.5.0" }, - { "Facade", "false" } - }); - - var gammaReference = new MockTaskItem( - itemSpec: "Packages\\MyPackage\\1.5.0\\GammaAssembly.dll", - metadata: new Dictionary - { - { "NuGetPackageId", "MyPackage" }, - { "NuGetPackageVersion", "1.5.0" }, - { "Facade", "true" } - }); - - var task = new PreprocessPackageDependenciesDesignTime(); - task.TargetDefinitions = new[] { netStandard20Target }; - task.PackageDefinitions = new ITaskItem[] { myPackage }; - task.FileDefinitions = new ITaskItem[] { }; - task.PackageDependencies = new ITaskItem[] { myPackageDependency }; - task.FileDependencies = new ITaskItem[] { }; - task.References = new ITaskItem[] { alphaReference, betaReference, gammaReference }; - task.DefaultImplicitPackages = string.Empty; - task.TargetFrameworkMoniker = ".NETStandard,Version=v2.0"; - - // Act - var result = task.Execute(); - - // Assert - result.Should().BeTrue(); - task.DependenciesDesignTime.Count().Should().Be(5); - - var alphaDependency = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".NETStandard,Version=v2.0/MyPackage/1.5.0/AlphaAssembly.dll")) - .Single(); - alphaDependency.GetBooleanMetadata(PreprocessPackageDependenciesDesignTime.VisibleMetadata) - .Should().BeTrue(); - - var betaDependency = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".NETStandard,Version=v2.0/MyPackage/1.5.0/BetaAssembly.dll")) - .Single(); - betaDependency.GetBooleanMetadata(PreprocessPackageDependenciesDesignTime.VisibleMetadata) - .Should().BeTrue(); - - var gammaDependency = task.DependenciesDesignTime - .Where(x => x.ItemSpec.Equals(".NETStandard,Version=v2.0/MyPackage/1.5.0/GammaAssembly.dll")) - .Single(); - gammaDependency.GetBooleanMetadata(PreprocessPackageDependenciesDesignTime.VisibleMetadata) - .Should().BeFalse(); - } - - private void VerifyTargetTaskItem(DependencyType type, ITaskItem input, ITaskItem output) - { - type.ToString().Should().Be(output.GetMetadata(MetadataKeys.Type)); + var task = new PreprocessPackageDependenciesDesignTime + { + TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + DefaultImplicitPackages = string.Empty, + PackageDefinitions = new ITaskItem[] { + new MockTaskItem( + itemSpec: "Package1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "Package1" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "" }, + { MetadataKeys.Type, "Package" } + }), + new MockTaskItem( + itemSpec: "ChildPackage1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.Name, "ChildPackage1" }, + { MetadataKeys.Version, "1.0.0" }, + { MetadataKeys.Path, "some path" }, + { MetadataKeys.ResolvedPath, "some resolved path" }, + { MetadataKeys.Type, "Package" } + }) + }, + PackageDependencies = new ITaskItem[] { + new MockTaskItem( + itemSpec: "Package1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + }), + new MockTaskItem( + itemSpec: "ChildPackage1/1.0.0", + metadata: new Dictionary + { + { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, + { MetadataKeys.ParentPackage, "Package1/1.0.0" } + }) + } + }; - // remove unnecessary metadata to keep only ones that would be in result task items - var removeMetadata = new[] { MetadataKeys.Type, MetadataKeys.ResolvedPath }; + Assert.True(task.Execute()); - foreach (var rm in removeMetadata) - { - output.RemoveMetadata(rm); - input.RemoveMetadata(rm); - } + var item = Assert.Single(task.PackageDependenciesDesignTime); - foreach (var metadata in input.MetadataNames) - { - input.GetMetadata(metadata.ToString()).Should().Be(output.GetMetadata(metadata.ToString())); - } + Assert.Equal("Package1/1.0.0", item.ItemSpec); } } } From f86860682c3a185e51f0697a518bf29841108fa5 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Mon, 11 May 2020 12:14:45 +1000 Subject: [PATCH 702/896] Remove ReportAssetsLogMessages task Since VS 16.7, design-time builds no longer consume assets file diagnostics as items. This commit removes their generation and supporting code. --- src/Tasks/Common/DiagnosticMessageSeverity.cs | 15 -- src/Tasks/Common/DiagnosticsHelper.cs | 58 ----- .../GivenThatWeReportAssetsLogMessages.cs | 207 ------------------ .../LoadAssetsFile.cs | 22 -- .../ReportAssetsLogMessages.cs | 118 ---------- ...rosoft.PackageDependencyResolution.targets | 38 +--- 6 files changed, 1 insertion(+), 457 deletions(-) delete mode 100644 src/Tasks/Common/DiagnosticMessageSeverity.cs delete mode 100644 src/Tasks/Common/DiagnosticsHelper.cs delete mode 100644 src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeReportAssetsLogMessages.cs delete mode 100644 src/Tasks/Microsoft.NET.Build.Tasks/LoadAssetsFile.cs delete mode 100644 src/Tasks/Microsoft.NET.Build.Tasks/ReportAssetsLogMessages.cs diff --git a/src/Tasks/Common/DiagnosticMessageSeverity.cs b/src/Tasks/Common/DiagnosticMessageSeverity.cs deleted file mode 100644 index b127b4c9d591..000000000000 --- a/src/Tasks/Common/DiagnosticMessageSeverity.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.NET.Build.Tasks -{ - /// - /// Specifies the severity of Diagnostic Messages - /// - internal enum DiagnosticMessageSeverity - { - Info, - Warning, - Error, - } -} diff --git a/src/Tasks/Common/DiagnosticsHelper.cs b/src/Tasks/Common/DiagnosticsHelper.cs deleted file mode 100644 index 58518655beeb..000000000000 --- a/src/Tasks/Common/DiagnosticsHelper.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Collections.Generic; - -namespace Microsoft.NET.Build.Tasks -{ - /// - /// Writes diagnostic messages to the task log and creates diagnostic task items - /// that can be returned from a task - /// - internal sealed class DiagnosticsHelper - { - private readonly List _diagnosticMessages = new List(); - - public ITaskItem[] GetDiagnosticMessages() => _diagnosticMessages.ToArray(); - - public ITaskItem Add( - string diagnosticCode, - string message, - string filePath, - DiagnosticMessageSeverity severity, - int startLine, - int startColumn, - int endLine, - int endColumn, - string targetFrameworkMoniker, - string packageId) - { - string itemspec = - (string.IsNullOrEmpty(targetFrameworkMoniker) ? string.Empty : $"{targetFrameworkMoniker}/") + - (string.IsNullOrEmpty(packageId) ? string.Empty : $"{packageId}/") + - diagnosticCode; - - var diagnostic = new TaskItem(itemspec, new Dictionary - { - { MetadataKeys.DiagnosticCode, diagnosticCode }, - { MetadataKeys.Message, message }, - { MetadataKeys.FilePath, filePath ?? string.Empty }, - { MetadataKeys.Severity, severity.ToString() }, - - { MetadataKeys.StartLine, startLine.ToString() }, - { MetadataKeys.StartColumn, startColumn.ToString() }, - { MetadataKeys.EndLine, endLine.ToString() }, - { MetadataKeys.EndColumn, endColumn.ToString() }, - - { MetadataKeys.ParentTarget, targetFrameworkMoniker ?? string.Empty }, - { MetadataKeys.ParentPackage, packageId ?? string.Empty }, - }); - - _diagnosticMessages.Add(diagnostic); - - return diagnostic; - } - } -} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeReportAssetsLogMessages.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeReportAssetsLogMessages.cs deleted file mode 100644 index 377703da8b24..000000000000 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeReportAssetsLogMessages.cs +++ /dev/null @@ -1,207 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using FluentAssertions; -using NuGet.Common; -using NuGet.ProjectModel; -using System; -using System.Linq; -using Xunit; -using static Microsoft.NET.Build.Tasks.UnitTests.LockFileSnippets; - -namespace Microsoft.NET.Build.Tasks.UnitTests -{ - public class GivenThatWeReportAssetsLogMessages - { - [Fact] - public void ItReportsDiagnosticsWithMinimumData() - { - string lockFileContent = CreateDefaultLockFileSnippet( - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "Sample warning") - } - ); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().HaveCount(1); - } - - [Theory] - [InlineData(null)] - [InlineData(new object[] { new string[0] })] - public void ItReportsZeroDiagnosticsWithNoLogs(string [] logsJson) - { - string lockFileContent = CreateDefaultLockFileSnippet(logsJson); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().BeEmpty(); - } - - [Fact] - public void ItReportsDiagnosticsMetadataWithLogs() - { - string lockFileContent = CreateDefaultLockFileSnippet( - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Error, "Sample error", - filePath: "path/to/project.csproj", - libraryId: "LibA", - targetGraphs: new string[]{ ".NETCoreApp,Version=v1.0" }), - CreateLog(NuGetLogCode.NU1001, LogLevel.Warning, "Sample warning", - libraryId: "LibB", - targetGraphs: new string[]{ ".NETCoreApp,Version=v1.0" }) - } - ); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().HaveCount(2); - - Action checkMetadata = (key, val1, val2) => { - task.DiagnosticMessages - .Select(item => item.GetMetadata(key)) - .Should().Contain(new string[] { val1, val2 }); - }; - - checkMetadata(MetadataKeys.DiagnosticCode, "NU1000", "NU1001"); - checkMetadata(MetadataKeys.Severity, "Error", "Warning"); - checkMetadata(MetadataKeys.Message, "Sample error", "Sample warning"); - checkMetadata(MetadataKeys.FilePath, "", "path/to/project.csproj"); - checkMetadata(MetadataKeys.ParentTarget, ".NETCoreApp,Version=v1.0", ".NETCoreApp,Version=v1.0"); - checkMetadata(MetadataKeys.ParentPackage, "LibA/1.2.3", "LibB/1.2.3"); - } - - [Theory] - [InlineData(null, null, ".NETCoreApp,Version=v1.0", "")] - [InlineData(new string[] { ".NETCoreApp,Version=v1.0" }, null, ".NETCoreApp,Version=v1.0", "")] - [InlineData(null, "LibA", ".NETCoreApp,Version=v1.0", "LibA/1.2.3")] - [InlineData(new string[] { ".NETCoreApp,Version=v1.0" }, "LibA", ".NETCoreApp,Version=v1.0", "LibA/1.2.3")] - public void ItReportsDiagnosticsWithAllTargetLibraryCases(string[] targetGraphs, string libraryId, string expectedTarget, string expectedPackage) - { - string lockFileContent = CreateDefaultLockFileSnippet( - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "Sample warning", - filePath: "path/to/project.csproj", - libraryId: libraryId, - targetGraphs: targetGraphs) - } - ); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().HaveCount(1); - var item = task.DiagnosticMessages.First(); - - item.GetMetadata(MetadataKeys.ParentTarget).Should().Be(expectedTarget); - item.GetMetadata(MetadataKeys.ParentPackage).Should().Be(expectedPackage); - } - - [Fact] - public void ItHandlesInfoLogLevels() - { - string lockFileContent = CreateDefaultLockFileSnippet( - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "Sample message"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Minimal, "Sample message"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Verbose, "Sample message"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Debug, "Sample message"), - } - ); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().HaveCount(4); - - task.DiagnosticMessages - .Select(item => item.GetMetadata(MetadataKeys.Severity)) - .Should().OnlyContain(s => s == "Info"); - } - - [Theory] - [InlineData(new string[] { ".NETCoreApp,Version=v1.0", ".NETFramework,Version=v4.6.1" }, "LibA")] - [InlineData(new string[] { ".NETCoreApp,Version=v1.0" }, "LibA")] - public void ItHandlesMultiTFMScenarios(string[] targetGraphs, string libraryId) - { - string lockFileContent = CreateLockFileSnippet( - targets: new string[] { - CreateTarget(".NETCoreApp,Version=v1.0", TargetLibA, TargetLibB, TargetLibC), - CreateTarget(".NETFramework,Version=v4.6.1", TargetLibA, TargetLibB, TargetLibC), - }, - libraries: new string[] { LibADefn, LibBDefn, LibCDefn }, - projectFileDependencyGroups: new string[] { - ProjectGroup, NETCoreGroup, NET461Group - }, - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "Sample warning", - filePath: "path/to/project.csproj", - libraryId: libraryId, - targetGraphs: targetGraphs) - } - ); - - var task = GetExecutedTaskFromContents(lockFileContent); - - // a diagnostic for each target graph... - task.DiagnosticMessages.Should().HaveCount(targetGraphs.Length); - - task.DiagnosticMessages - .Select(item => item.GetMetadata(MetadataKeys.ParentTarget)) - .Should().Contain(targetGraphs); - - task.DiagnosticMessages - .Select(item => item.GetMetadata(MetadataKeys.ParentPackage)) - .Should().OnlyContain(v => v.StartsWith(libraryId)); - } - - [Fact] - public void ItSkipsInvalidEntries() - { - string lockFileContent = CreateDefaultLockFileSnippet( - logs: new string[] { - CreateLog(NuGetLogCode.NU1000, LogLevel.Error, "Sample error that will be invalid"), - CreateLog(NuGetLogCode.NU1001, LogLevel.Warning, "Sample warning"), - } - ); - lockFileContent = lockFileContent.Replace("NU1000", "CA1000"); - - var task = GetExecutedTaskFromContents(lockFileContent); - - task.DiagnosticMessages.Should().HaveCount(1); - - task.DiagnosticMessages - .Select(item => item.GetMetadata(MetadataKeys.DiagnosticCode)) - .Should().OnlyContain(v => v == "NU1001"); - } - - private static string CreateDefaultLockFileSnippet(string[] logs = null) => - CreateLockFileSnippet( - targets: new string[] { - CreateTarget(".NETCoreApp,Version=v1.0", TargetLibA, TargetLibB, TargetLibC), - }, - libraries: new string[] { LibADefn, LibBDefn, LibCDefn }, - projectFileDependencyGroups: new string[] { - ProjectGroup, NETCoreGroup - }, - logs: logs - ); - - private ReportAssetsLogMessages GetExecutedTaskFromContents(string lockFileContents) - { - var lockFile = TestLockFiles.CreateLockFile(lockFileContents); - return GetExecutedTask(lockFile); - } - - private ReportAssetsLogMessages GetExecutedTask(LockFile lockFile) - { - var task = new ReportAssetsLogMessages(lockFile) - { - ProjectAssetsFile = lockFile.Path, - }; - - task.Execute().Should().BeTrue(); - - return task; - } - } -} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/LoadAssetsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/LoadAssetsFile.cs deleted file mode 100644 index d0c22c83f777..000000000000 --- a/src/Tasks/Microsoft.NET.Build.Tasks/LoadAssetsFile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.NET.Build.Tasks -{ - public sealed class LoadAssetsFile : TaskBase - { - /// - /// The assets file to process - /// - public string ProjectAssetsFile - { - get; set; - } - - protected override void ExecuteCore() - { - var lockFile = new LockFileCache(this).GetLockFile(ProjectAssetsFile); - } - } -} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ReportAssetsLogMessages.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ReportAssetsLogMessages.cs deleted file mode 100644 index 180ad7634eb7..000000000000 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ReportAssetsLogMessages.cs +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using Microsoft.Build.Framework; -using NuGet.Common; -using NuGet.ProjectModel; -using System.Linq; - -namespace Microsoft.NET.Build.Tasks -{ - /// - /// Raise log messages in the assets file as DiagnosticMessage items - /// that can be consumed downstream (e.g. by the dependency node in - /// the solution explorer) - /// - public sealed class ReportAssetsLogMessages : TaskBase - { - private LockFile _lockFile; - private DiagnosticsHelper _diagnostics; - - #region Outputs - - [Output] - public ITaskItem[] DiagnosticMessages => _diagnostics.GetDiagnosticMessages(); - - #endregion - - #region Inputs - - /// - /// The assets file to process - /// - public string ProjectAssetsFile - { - get; set; - } - - #endregion - - public ReportAssetsLogMessages() - { - _diagnostics = new DiagnosticsHelper(); - } - - #region Test Support - - internal ReportAssetsLogMessages(LockFile lockFile) : this() - { - _lockFile = lockFile; - } - - #endregion - - private LockFile LockFile - { - get - { - if (_lockFile == null) - { - _lockFile = new LockFileCache(this).GetLockFile(ProjectAssetsFile); - } - - return _lockFile; - } - } - - protected override void ExecuteCore() - { - foreach (var message in LockFile.LogMessages) - { - AddMessage(message); - } - } - - private void AddMessage(IAssetsLogMessage message) - { - var targetGraphs = message.GetTargetGraphs(LockFile); - - targetGraphs = targetGraphs.Any() ? targetGraphs : new LockFileTarget[] { null }; - - foreach (var target in targetGraphs) - { - var targetLib = message.LibraryId == null ? null : target?.GetTargetLibrary(message.LibraryId); - - _diagnostics.Add( - message.Code.ToString(), - message.Message, - message.FilePath, - FromLogLevel(message.Level), - message.StartLineNumber, - message.StartColumnNumber, - message.EndLineNumber, - message.EndColumnNumber, - target?.Name, - targetLib == null ? null : $"{targetLib.Name}/{targetLib.Version.ToNormalizedString()}"); - } - } - - private static DiagnosticMessageSeverity FromLogLevel(LogLevel level) - { - switch (level) - { - case LogLevel.Error: - return DiagnosticMessageSeverity.Error; - - case LogLevel.Warning: - return DiagnosticMessageSeverity.Warning; - - case LogLevel.Debug: - case LogLevel.Verbose: - case LogLevel.Information: - case LogLevel.Minimal: - default: - return DiagnosticMessageSeverity.Info; - } - } - } -} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index f5d1fd8b2145..b065bbe50575 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -168,8 +168,7 @@ Copyright (c) .NET Foundation. All rights reserved. the Visual Studio error list when a project is created before NuGet restore has run and created the assets file. --> + Condition=" '$(DesignTimeBuild)' != 'true' Or Exists('$(ProjectAssetsFile)')"> - - - - - - - - - - - - - - - - - + false @@ -183,12 +187,15 @@ Copyright (c) .NET Foundation. All rights reserved. ProjectPath="$(MSBuildProjectFullPath)" ProjectAssetsFile="$(ProjectAssetsFile)" ProjectLanguage="$(Language)" + EmitLegacyAssetsFileItems="$(EmitLegacyAssetsFileItems)" ContinueOnError="ErrorAndContinue"> - - + + + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 1d1f90d7da87..0a80bfac1dbb 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -247,6 +247,7 @@ public void It_restores_only_ridless_tfm() "netcoreapp2.1", "TargetDefinitions", GetValuesCommand.ValueType.Item) { DependsOnTargets = "RunResolvePackageDependencies", + Properties = { { "EmitLegacyAssetsFileItems", "true" } } }; getValuesCommand diff --git a/src/Tests/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs b/src/Tests/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs index 6c0a9293ca99..33c36daa8030 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs +++ b/src/Tests/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs @@ -30,6 +30,7 @@ public enum ValueType public string Configuration { get; set; } public List MetadataNames { get; set; } = new List(); + public Dictionary Properties { get; } = new Dictionary(); public GetValuesCommand(ITestOutputHelper log, string projectPath, string targetFramework, string valueName, ValueType valueType = ValueType.Property) @@ -69,8 +70,20 @@ protected override SdkCommandSpec CreateCommand(IEnumerable args) } } + string propertiesElement = ""; + if (Properties.Count != 0) + { + propertiesElement += "\n"; + foreach ((string key, string value) in Properties) + { + propertiesElement += $" <{key}>{value}\n"; + } + propertiesElement += " "; + } + string injectTargetContents = $@" + {propertiesElement} From e4415941d1de85ffa4d4bd5d50bd952e13411197 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 03:02:02 +0000 Subject: [PATCH 707/896] Update dependencies from https://github.com/dotnet/fsharp build 20200511.1 (#4544) - Microsoft.FSharp.Compiler: 10.10.0-beta.20255.2 -> 10.10.0-beta.20261.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8d89798cb05..4cce72a55266 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 5ea5d6913b1f7ce7692364726e262f253fd285bd + 040865355cad628377d38a223f596648ef08e80b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2b4b4d1b929e..39bd5004ff80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20255.2 + 10.10.0-beta.20261.1 From f7c4f1d0be31edc8bf4359b745e60860dabe89ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 03:40:53 +0000 Subject: [PATCH 708/896] Update dependencies from https://github.com/dotnet/sdk build 20200511.2 (#13351) - Microsoft.NET.Sdk: 3.1.400-preview.20252.7 -> 3.1.400-preview.20261.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10c52508676e..03745138912f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 6047903fd599e7704e8d97b9203ce004a4409942 + f3663e3086f7a388d4ec53a438ecbf017e271f92 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 530b9c326326..abe8e2217abb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20252.7 + 3.1.400-preview.20261.2 $(MicrosoftNETSdkPackageVersion) From 61f958c99228456155e0f691225824d2307c2b55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 04:37:57 +0000 Subject: [PATCH 709/896] Update dependencies from https://github.com/dotnet/cli build 20200511.1 (#4545) - Microsoft.DotNet.Cli.Runtime: 3.1.400-preview.20252.1 -> 3.1.400-preview.20261.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cce72a55266..ce19511c2ddd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 983e5e463595e381a7ca87d5ec93f0cf7387f03f + f7c4f1d0be31edc8bf4359b745e60860dabe89ee https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 39bd5004ff80..d0bbacf3bd2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20252.1 + 3.1.400-preview.20261.1 From 22b65529a7ee08569c6dcf73792614736c6ddfd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 18:34:52 +0000 Subject: [PATCH 710/896] Update dependencies from https://github.com/dotnet/roslyn build 20200512.2 (#4546) - Microsoft.Net.Compilers.Toolset: 3.6.0-3.20218.3 -> 3.7.0-1.20262.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce19511c2ddd..639bb8fb199f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 040865355cad628377d38a223f596648ef08e80b - + https://github.com/dotnet/roslyn - 37ad245fb9a7e7bf2e5b67eb377e1cf252765b6b + d6aa790a2051d9c0bd99ba9f7c6ea5be1568173c https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index d0bbacf3bd2e..ef4b2b80d54b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.6.0-3.20218.3 + 3.7.0-1.20262.2 From e5e26b740017d50bd9dede73368f9b14ba46311b Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 13 May 2020 11:21:12 +1000 Subject: [PATCH 711/896] Document property value Co-authored-by: Daniel Plaisted --- .../targets/Microsoft.PackageDependencyResolution.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index 296941795b43..98e5ed94f261 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -49,7 +49,7 @@ Copyright (c) .NET Foundation. All rights reserved. true - false From c64e80bbdadb65cf05fc009d1c5041910a475272 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 08:59:00 +0000 Subject: [PATCH 712/896] Update dependencies from https://github.com/dotnet/sdk build 20200513.1 (#4547) - Microsoft.NET.Sdk: 3.1.400-preview.20261.2 -> 3.1.400-preview.20263.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 639bb8fb199f..2e6e18920127 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli f7c4f1d0be31edc8bf4359b745e60860dabe89ee - + https://github.com/dotnet/sdk - f3663e3086f7a388d4ec53a438ecbf017e271f92 + b9874ceb1f1baae24c34436220ace0f1a073bdcf https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index ef4b2b80d54b..81df7e5b14fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20261.2 + 3.1.400-preview.20263.1 From d5d6ca90b442830c1d4e0e8b5c459d6d5471c0b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 09:25:40 +0000 Subject: [PATCH 713/896] Update dependencies from https://github.com/dotnet/fsharp build 20200513.1 (#4548) - Microsoft.FSharp.Compiler: 10.10.0-beta.20261.1 -> 10.10.0-beta.20263.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e6e18920127..9d6162247520 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 - + https://github.com/dotnet/fsharp - 040865355cad628377d38a223f596648ef08e80b + e6f02c152a5f37333d94a70e3fa3c6cd51720b9f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 81df7e5b14fa..489234e6efa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20261.1 + 10.10.0-beta.20263.1 From e5e713e486c79d3aae68488c159e8fc62e6e5e33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 16:11:48 +0000 Subject: [PATCH 714/896] Update dependencies from https://github.com/dotnet/sdk build 20200513.1 (#13352) - Microsoft.NET.Sdk: 3.1.400-preview.20261.2 -> 3.1.400-preview.20263.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03745138912f..0c861857da4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - f3663e3086f7a388d4ec53a438ecbf017e271f92 + b9874ceb1f1baae24c34436220ace0f1a073bdcf https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index abe8e2217abb..9c3bd72b5e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20261.2 + 3.1.400-preview.20263.1 $(MicrosoftNETSdkPackageVersion) From 58e5ae124839b336ddbfee4394af2ffbe989f2d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 17:47:22 +0000 Subject: [PATCH 715/896] Update dependencies from https://github.com/dotnet/cli build 20200513.1 (#4549) - Microsoft.DotNet.Cli.Runtime: 3.1.400-preview.20261.1 -> 3.1.400-preview.20263.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d6162247520..90bac0ae810e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - f7c4f1d0be31edc8bf4359b745e60860dabe89ee + e5e713e486c79d3aae68488c159e8fc62e6e5e33 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 489234e6efa3..47090bf02245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20261.1 + 3.1.400-preview.20263.1 From f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 01:03:03 +0000 Subject: [PATCH 716/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#11594) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6609 - NuGet.Build.Tasks: 5.7.0-preview.1.6592 -> 5.7.0-preview.1.6609 * Update stage0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Li --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1560b6e968ad..77396661dc26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 + 12a375a8a02764b772a20371abaf797639a7f961 diff --git a/eng/Versions.props b/eng/Versions.props index 1752e7423e97..e8a0e151efe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-preview.1.6592 + 5.7.0-preview.1.6609 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 diff --git a/global.json b/global.json index 357b230fe582..03378219f891 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015128", + "dotnet": "3.1.400-preview-015135", "vs-opt": { "version": "15.9" } From dbdb967e932ab28f4016094948372a5c4f715ba6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 02:24:32 +0000 Subject: [PATCH 717/896] Update dependencies from https://github.com/dotnet/sdk build 20200513.9 (#4550) Microsoft.NET.Sdk From Version 3.1.400-preview.20263.1 -> To Version 3.1.400-preview.20263.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90bac0ae810e..0b8c4805cdbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli e5e713e486c79d3aae68488c159e8fc62e6e5e33 - + https://github.com/dotnet/sdk - b9874ceb1f1baae24c34436220ace0f1a073bdcf + f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 47090bf02245..e0460b49b107 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20263.1 + 3.1.400-preview.20263.9 From 04fca9f456bdb23e32dabfb0d7542861e0a499f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 19:05:49 +0000 Subject: [PATCH 718/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6609 (#13358) NuGet.Build.Tasks From Version 5.7.0-preview.1.6592 -> To Version 5.7.0-preview.1.6609 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c861857da4e..b2bbfbc3c9fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 4dbf16e68eabf507b9f156c801b1b7c3b0586e43 + 12a375a8a02764b772a20371abaf797639a7f961 diff --git a/eng/Versions.props b/eng/Versions.props index 9c3bd72b5e68..9f7356bbbd58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.7.0-preview.1.6592 + 5.7.0-preview.1.6609 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c81545d6c942b2facaf1a7d0c40c0157e5275635 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 20:30:45 +0000 Subject: [PATCH 719/896] Update dependencies from https://github.com/dotnet/cli build 20200515.3 (#4556) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20263.1 -> To Version 3.1.400-preview.20265.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b8c4805cdbe..2b2524028c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - e5e713e486c79d3aae68488c159e8fc62e6e5e33 + 04fca9f456bdb23e32dabfb0d7542861e0a499f2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e0460b49b107..2e5abc4afad0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20263.1 + 3.1.400-preview.20265.3 From 45d1508f679bf055cb8888aae070620fa56ec4ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 05:42:58 +0000 Subject: [PATCH 720/896] [release/3.1.4xx] Update dependencies from dotnet/sdk (#13353) * Update dependencies from https://github.com/dotnet/sdk build 20200513.9 Microsoft.NET.Sdk From Version 3.1.400-preview.20263.1 -> To Version 3.1.400-preview.20263.9 * Update stage 0 * Stage 0 update for LKG version * Bump MSBuild version to 16.7 * Update NuGet clien version to 6609 * Fix deployment of hostfxr for SDK Resolver After https://github.com/dotnet/sdk/pull/11358, EmitLegacyAssetsFileItems needs to be set to true in order to generate FileDefinitions items. Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff Co-authored-by: Rainer Sigwald Co-authored-by: Daniel Plaisted --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 6 +++--- global.json | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2bbfbc3c9fe..34ea98dc2e8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - b9874ceb1f1baae24c34436220ace0f1a073bdcf + f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 9f7356bbbd58..406245e4736b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.200-preview-014946 + 3.1.400-preview-015138 @@ -32,14 +32,14 @@ - 16.5.0-preview-20064-06 + 16.7.0-preview-20265-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 3.1.400-preview.20263.1 + 3.1.400-preview.20263.9 $(MicrosoftNETSdkPackageVersion) diff --git a/global.json b/global.json index e7706d791b20..680ab6d71015 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.200-preview-014946", + "dotnet": "3.1.400-preview-015138", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 3bf755e8d7bf..3108644e0546 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -13,6 +13,8 @@ false $(SdkResolverOutputDirectory) true + + true From ceda5b15f78f1829b991bd6d27a597b61f8c9d8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 07:13:48 +0000 Subject: [PATCH 721/896] Update dependencies from https://github.com/dotnet/cli build 20200518.1 (#4561) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20265.3 -> To Version 3.1.400-preview.20268.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b2524028c75..d50d3dc852ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 04fca9f456bdb23e32dabfb0d7542861e0a499f2 + 45d1508f679bf055cb8888aae070620fa56ec4ba https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2e5abc4afad0..e6d102c466b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20265.3 + 3.1.400-preview.20268.1 From 1093cdbebd79696d0b2a09144fddb47b8fde73bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 17:30:47 +0000 Subject: [PATCH 722/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.1 (#4563) Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20230.5 -> To Version 1.0.0-beta.20269.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 8 -- .../templates/post-build/post-build.yml | 86 ++++++------------- global.json | 2 +- 4 files changed, 28 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50d3dc852ea..756dbb07fa61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 + cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 216d043e4e3b..1883d2b17006 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -29,14 +29,6 @@ variables: - name: NetCore_3_Tools_Channel_Id value: 344 - # .NET Core 3.0 Internal Servicing - - name: InternalServicing_30_Channel_Id - value: 184 - - # .NET Core 3.0 Release - - name: PublicRelease_30_Channel_Id - value: 19 - # .NET Core 3.1 Release - name: PublicRelease_31_Channel_Id value: 129 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d916c22003d3..f145305b8a67 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -103,18 +103,6 @@ stages: continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev5_Publish' - channelName: '.NET Core 5 Dev' - channelId: 131 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -175,18 +163,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Release30_Publish' - channelName: '.NET Core 3.0 Release' - channelId: 19 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -211,18 +187,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_30_Internal_Servicing_Publishing' - channelName: '.NET Core 3.0 Internal Servicing' - channelId: 184 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -271,30 +235,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Publishing' - channelName: '.NET Core SDK 3.0.1xx' - channelId: 556 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Internal_Publishing' - channelName: '.NET Core SDK 3.0.1xx Internal' - channelId: 555 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -389,4 +329,28 @@ stages: channelId: 922 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_6_Publishing' + channelName: 'VS 16.6' + channelId: 1010 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_7_Publishing' + channelName: 'VS 16.7' + channelId: 1011 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index f83388fc0582..f5a399b9db9e 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1" } } From c8070a6666135d426d04aead4c3b52047fb4e1e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 18:01:15 +0000 Subject: [PATCH 723/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.1 (#13365) Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20230.5 -> To Version 1.0.0-beta.20269.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 8 -- .../templates/post-build/post-build.yml | 86 ++++++------------- global.json | 2 +- 4 files changed, 28 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34ea98dc2e8c..24c11afd3d72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 + cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 216d043e4e3b..1883d2b17006 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -29,14 +29,6 @@ variables: - name: NetCore_3_Tools_Channel_Id value: 344 - # .NET Core 3.0 Internal Servicing - - name: InternalServicing_30_Channel_Id - value: 184 - - # .NET Core 3.0 Release - - name: PublicRelease_30_Channel_Id - value: 19 - # .NET Core 3.1 Release - name: PublicRelease_31_Channel_Id value: 129 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d916c22003d3..f145305b8a67 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -103,18 +103,6 @@ stages: continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev5_Publish' - channelName: '.NET Core 5 Dev' - channelId: 131 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -175,18 +163,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Release30_Publish' - channelName: '.NET Core 3.0 Release' - channelId: 19 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -211,18 +187,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_30_Internal_Servicing_Publishing' - channelName: '.NET Core 3.0 Internal Servicing' - channelId: 184 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -271,30 +235,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Publishing' - channelName: '.NET Core SDK 3.0.1xx' - channelId: 556 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Internal_Publishing' - channelName: '.NET Core SDK 3.0.1xx Internal' - channelId: 555 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -389,4 +329,28 @@ stages: channelId: 922 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_6_Publishing' + channelName: 'VS 16.6' + channelId: 1010 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_7_Publishing' + channelName: 'VS 16.7' + channelId: 1011 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 680ab6d71015..23a4677d2efd 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1" } } From 8fb250bd7a3065c4044f72ed6fda7f74684193c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 19:11:16 +0000 Subject: [PATCH 724/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.1 (#11692) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20230.5 -> To Version 1.0.0-beta.20269.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- .../templates/post-build/common-variables.yml | 8 -- .../templates/post-build/post-build.yml | 86 ++++++------------- global.json | 4 +- 5 files changed, 34 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77396661dc26..f45392cb189c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 + cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 - + https://github.com/dotnet/arcade - 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 + cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 - + https://github.com/dotnet/arcade - 5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9 + cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e8a0e151efe7..e34c748b20d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20230.5 + 1.0.0-beta.20269.1 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 216d043e4e3b..1883d2b17006 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -29,14 +29,6 @@ variables: - name: NetCore_3_Tools_Channel_Id value: 344 - # .NET Core 3.0 Internal Servicing - - name: InternalServicing_30_Channel_Id - value: 184 - - # .NET Core 3.0 Release - - name: PublicRelease_30_Channel_Id - value: 19 - # .NET Core 3.1 Release - name: PublicRelease_31_Channel_Id value: 129 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d916c22003d3..f145305b8a67 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -103,18 +103,6 @@ stages: continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev5_Publish' - channelName: '.NET Core 5 Dev' - channelId: 131 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -175,18 +163,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Release30_Publish' - channelName: '.NET Core 3.0 Release' - channelId: 19 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -211,18 +187,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_30_Internal_Servicing_Publishing' - channelName: '.NET Core 3.0 Internal Servicing' - channelId: 184 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -271,30 +235,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Publishing' - channelName: '.NET Core SDK 3.0.1xx' - channelId: 556 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_301xx_Internal_Publishing' - channelName: '.NET Core SDK 3.0.1xx Internal' - channelId: 555 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -389,4 +329,28 @@ stages: channelId: 922 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_6_Publishing' + channelName: 'VS 16.6' + channelId: 1010 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_7_Publishing' + channelName: 'VS 16.7' + channelId: 1011 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 03378219f891..bbc49ac1efdd 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20230.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20269.1" } } From 402b9bf677cd861c11c4de8ef0677e3a7b7ac860 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 19:29:23 +0000 Subject: [PATCH 725/896] Update dependencies from https://github.com/microsoft/msbuild build 20200424.1 (#4565) Microsoft.Build.Localization , Microsoft.Build From Version 16.6.0-preview-20216-03 -> To Version 16.7.0-preview-20224-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 756dbb07fa61..8811cf7a2df2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 - + https://github.com/microsoft/msbuild - 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 + a123b6db0758e426ec84667ce10665a56455fd5e - + https://github.com/microsoft/msbuild - 8a8a26f9b0df1079df34f42a4396c49c2d6f3087 + a123b6db0758e426ec84667ce10665a56455fd5e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6d102c466b7..b6e8dc167a7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.6.0-preview-20216-03 + 16.7.0-preview-20224-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.6.0-preview-20216-03 + 16.7.0-preview-20224-01 $(MicrosoftBuildPackageVersion) From 9ef5ef02b5f23b8a081f84bd2e7c0d092163b199 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 20:53:37 +0000 Subject: [PATCH 726/896] Update dependencies from https://github.com/dotnet/cli build 20200519.3 (#4568) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20268.1 -> To Version 3.1.400-preview.20269.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8811cf7a2df2..8fa18738cd62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 45d1508f679bf055cb8888aae070620fa56ec4ba + c8070a6666135d426d04aead4c3b52047fb4e1e5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b6e8dc167a7e..6f2992f124a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20268.1 + 3.1.400-preview.20269.3 From 6809d65e0b79370fd20adf44fc9d6883baf91625 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 21:57:04 +0000 Subject: [PATCH 727/896] Update dependencies from https://github.com/dotnet/sdk build 20200519.8 (#4569) Microsoft.NET.Sdk From Version 3.1.400-preview.20263.9 -> To Version 3.1.400-preview.20269.8 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fa18738cd62..2b0157976f22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli c8070a6666135d426d04aead4c3b52047fb4e1e5 - + https://github.com/dotnet/sdk - f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 + 8fb250bd7a3065c4044f72ed6fda7f74684193c8 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6f2992f124a7..c2e2651be8ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20263.9 + 3.1.400-preview.20269.8 From 8ef03a4bb5e308f93169442cd0b8837c23fb20b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 22:02:52 +0000 Subject: [PATCH 728/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.3 (#4570) Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.1 -> To Version 1.0.0-beta.20269.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 30 +++++++++++++++++++++++++++--- global.json | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b0157976f22..58f4e36cd6cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 + ccfddb60fbd3de13463298334f00610edb5f63c6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 92a053bd16b4..bc228dfdf9fe 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -119,7 +119,9 @@ function InitializeDotNetCli([bool]$install) { # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { - $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue + $dotnetExecutable = GetExecutableFileName 'dotnet' + $dotnetCmd = Get-Command $dotnetExecutable -ErrorAction SilentlyContinue + if ($dotnetCmd -ne $null) { $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent } @@ -243,6 +245,10 @@ function InstallDotNet([string] $dotnetRoot, # Throws on failure. # function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) { + if (-not (IsWindowsPlatform)) { + throw "Cannot initialize Visual Studio on non-Windows" + } + if (Test-Path variable:global:_MSBuildExe) { return $global:_MSBuildExe } @@ -344,7 +350,11 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { # or $null if no instance meeting the requirements is found on the machine. # function LocateVisualStudio([object]$vsRequirements = $null){ - if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") { + if (-not (IsWindowsPlatform)) { + throw "Cannot run vswhere on non-Windows platforms." + } + + if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { $vswhereVersion = "2.5.2" @@ -404,7 +414,8 @@ function InitializeBuildTool() { Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } - $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" } + $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -610,6 +621,19 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } +function GetExecutableFileName($baseName) { + if (IsWindowsPlatform) { + return "$baseName.exe" + } + else { + return $baseName + } +} + +function IsWindowsPlatform() { + return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT +} + . $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") diff --git a/global.json b/global.json index f5a399b9db9e..2830a510b3d9 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3" } } From d1248815ac9e6e4210776f95425fd5646c59dece Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 23:18:15 +0000 Subject: [PATCH 729/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.3 (#11701) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20269.1 -> To Version 1.0.0-beta.20269.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.ps1 | 30 +++++++++++++++++++++++++++--- global.json | 4 ++-- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f45392cb189c..2a0fa229dcad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 + ccfddb60fbd3de13463298334f00610edb5f63c6 - + https://github.com/dotnet/arcade - cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 + ccfddb60fbd3de13463298334f00610edb5f63c6 - + https://github.com/dotnet/arcade - cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 + ccfddb60fbd3de13463298334f00610edb5f63c6 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e34c748b20d5..2451234be9ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20269.1 + 1.0.0-beta.20269.3 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 92a053bd16b4..bc228dfdf9fe 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -119,7 +119,9 @@ function InitializeDotNetCli([bool]$install) { # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { - $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue + $dotnetExecutable = GetExecutableFileName 'dotnet' + $dotnetCmd = Get-Command $dotnetExecutable -ErrorAction SilentlyContinue + if ($dotnetCmd -ne $null) { $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent } @@ -243,6 +245,10 @@ function InstallDotNet([string] $dotnetRoot, # Throws on failure. # function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) { + if (-not (IsWindowsPlatform)) { + throw "Cannot initialize Visual Studio on non-Windows" + } + if (Test-Path variable:global:_MSBuildExe) { return $global:_MSBuildExe } @@ -344,7 +350,11 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { # or $null if no instance meeting the requirements is found on the machine. # function LocateVisualStudio([object]$vsRequirements = $null){ - if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") { + if (-not (IsWindowsPlatform)) { + throw "Cannot run vswhere on non-Windows platforms." + } + + if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { $vswhereVersion = "2.5.2" @@ -404,7 +414,8 @@ function InitializeBuildTool() { Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } - $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" } + $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -610,6 +621,19 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } +function GetExecutableFileName($baseName) { + if (IsWindowsPlatform) { + return "$baseName.exe" + } + else { + return $baseName + } +} + +function IsWindowsPlatform() { + return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT +} + . $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") diff --git a/global.json b/global.json index bbc49ac1efdd..0cd14bdf4c78 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20269.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20269.3" } } From ea945818c69955472f9e29006d8693e1934f7484 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 00:51:14 +0000 Subject: [PATCH 730/896] Update dependencies from https://github.com/dotnet/sdk build 20200519.11 (#4573) Microsoft.NET.Sdk From Version 3.1.400-preview.20269.8 -> To Version 3.1.400-preview.20269.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58f4e36cd6cb..13d4c73f2928 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli c8070a6666135d426d04aead4c3b52047fb4e1e5 - + https://github.com/dotnet/sdk - 8fb250bd7a3065c4044f72ed6fda7f74684193c8 + d1248815ac9e6e4210776f95425fd5646c59dece https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c2e2651be8ed..54ec3e74b45a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20269.8 + 3.1.400-preview.20269.11 From 71cc2fe440cb842291a2fcb5bc23512395b247c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 08:14:22 +0000 Subject: [PATCH 731/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6618 (#13366) NuGet.Build.Tasks From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24c11afd3d72..5af5231b0cca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 12a375a8a02764b772a20371abaf797639a7f961 + 721908c643a7806b630774e76b53e37507fec062 diff --git a/eng/Versions.props b/eng/Versions.props index 406245e4736b..a3d43fd282fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.7.0-preview.1.6609 + 5.7.0-preview.2.6618 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From f3cf1beb6c571142fe1640349734468d34b76a83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 08:21:27 +0000 Subject: [PATCH 732/896] [release/3.1.4xx] Update dependencies from dotnet/sdk (#13369) * Update dependencies from https://github.com/dotnet/sdk build 20200519.8 Microsoft.NET.Sdk From Version 3.1.400-preview.20263.9 -> To Version 3.1.400-preview.20269.8 * Update dependencies from https://github.com/dotnet/sdk build 20200519.11 Microsoft.NET.Sdk From Version 3.1.400-preview.20263.9 -> To Version 3.1.400-preview.20269.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5af5231b0cca..2eefc6be0f3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - f9bb37a4c1db7833e86cd6f86669c39680d4f7d4 + d1248815ac9e6e4210776f95425fd5646c59dece https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index a3d43fd282fd..f429664223cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20263.9 + 3.1.400-preview.20269.11 $(MicrosoftNETSdkPackageVersion) From d8cfed28fe4625c99a0bfbf438e4359866cbb65a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 08:22:11 +0000 Subject: [PATCH 733/896] Update dependencies from https://github.com/dotnet/arcade build 20200519.3 (#13370) Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.1 -> To Version 1.0.0-beta.20269.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 30 +++++++++++++++++++++++++++--- global.json | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eefc6be0f3e..8bd6e5dbaee2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - cbc3025aab1ee03cd1b5f8fe87d1dbdc715dd894 + ccfddb60fbd3de13463298334f00610edb5f63c6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 92a053bd16b4..bc228dfdf9fe 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -119,7 +119,9 @@ function InitializeDotNetCli([bool]$install) { # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { - $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue + $dotnetExecutable = GetExecutableFileName 'dotnet' + $dotnetCmd = Get-Command $dotnetExecutable -ErrorAction SilentlyContinue + if ($dotnetCmd -ne $null) { $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent } @@ -243,6 +245,10 @@ function InstallDotNet([string] $dotnetRoot, # Throws on failure. # function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) { + if (-not (IsWindowsPlatform)) { + throw "Cannot initialize Visual Studio on non-Windows" + } + if (Test-Path variable:global:_MSBuildExe) { return $global:_MSBuildExe } @@ -344,7 +350,11 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { # or $null if no instance meeting the requirements is found on the machine. # function LocateVisualStudio([object]$vsRequirements = $null){ - if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") { + if (-not (IsWindowsPlatform)) { + throw "Cannot run vswhere on non-Windows platforms." + } + + if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { $vswhereVersion = "2.5.2" @@ -404,7 +414,8 @@ function InitializeBuildTool() { Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } - $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" } + $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -610,6 +621,19 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } +function GetExecutableFileName($baseName) { + if (IsWindowsPlatform) { + return "$baseName.exe" + } + else { + return $baseName + } +} + +function IsWindowsPlatform() { + return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT +} + . $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") diff --git a/global.json b/global.json index 23a4677d2efd..31c369ee1b08 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3" } } From a25b7ad1521ca842e2e5feb26d7155beccb85b34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 08:35:00 +0000 Subject: [PATCH 734/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6618 (#4564) NuGet.Build.Tasks From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13d4c73f2928..ba45488184dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 12a375a8a02764b772a20371abaf797639a7f961 + 721908c643a7806b630774e76b53e37507fec062 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 54ec3e74b45a..49c1430b8aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-preview.1.6609 + 5.7.0-preview.2.6618 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From a37212111f8306be855057dfa84cd45a1c522427 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 10:05:26 +0000 Subject: [PATCH 735/896] Update dependencies from https://github.com/dotnet/cli build 20200520.1 (#4578) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20269.3 -> To Version 3.1.400-preview.20270.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba45488184dd..e3779ccad061 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - c8070a6666135d426d04aead4c3b52047fb4e1e5 + 71cc2fe440cb842291a2fcb5bc23512395b247c2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 49c1430b8aff..03bb50c5ec59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20269.3 + 3.1.400-preview.20270.1 From 245d99fa5e6fa6c4addf73421d9b0f3094af8203 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 10:17:03 +0000 Subject: [PATCH 736/896] Update dependencies from https://github.com/dotnet/cli build 20200520.2 (#4579) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20270.1 -> To Version 3.1.400-preview.20270.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3779ccad061..f81c815a455a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 71cc2fe440cb842291a2fcb5bc23512395b247c2 + d8cfed28fe4625c99a0bfbf438e4359866cbb65a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 03bb50c5ec59..80421b94bbe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20270.1 + 3.1.400-preview.20270.2 From 4d3175aae7a9987c1ecceae5d374deef346f6e74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 22:08:13 +0000 Subject: [PATCH 737/896] Update dependencies from https://github.com/microsoft/msbuild build 20200520.3 (#4581) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20224-01 -> To Version 16.7.0-preview-20270-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f81c815a455a..3c950c18a61b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk d1248815ac9e6e4210776f95425fd5646c59dece - + https://github.com/microsoft/msbuild - a123b6db0758e426ec84667ce10665a56455fd5e + bee129d1b5adaab3826926afb5f54c12e2d4edb4 - + https://github.com/microsoft/msbuild - a123b6db0758e426ec84667ce10665a56455fd5e + bee129d1b5adaab3826926afb5f54c12e2d4edb4 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 80421b94bbe0..b9bf8cf3639f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20224-01 + 16.7.0-preview-20270-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20224-01 + 16.7.0-preview-20270-03 $(MicrosoftBuildPackageVersion) From 0490c9304ae16f74dabadc22344be5886c881cf2 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 20 May 2020 20:59:39 -0700 Subject: [PATCH 738/896] Publish NuGet.Build.Tasks.Console --- eng/Versions.props | 1 + src/redist/redist.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index b9bf8cf3639f..99a059109ef3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,6 +53,7 @@ 5.7.0-preview.2.6618 + $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 65d378c9457f..18260cfc2673 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -19,6 +19,7 @@ + From f4f2027614b8c0bbf9960c3d366d2a5a53946e62 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 20 May 2020 21:14:23 -0700 Subject: [PATCH 739/896] Add tests for RestoreUseStaticGraphEvaluation --- .../GivenThatIWantToRestoreApp.cs | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index 471aa0681fab..d72c70e96ce6 100644 --- a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -16,8 +16,10 @@ public class GivenThatIWantToRestoreApp : TestBase { private static string RepoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.config"); - [Fact] - public void ItRestoresAppToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresAppToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = TestAssets.CreateTestDirectory().FullName; @@ -33,6 +35,7 @@ public void ItRestoresAppToSpecificDirectory() .FullName; string args = $"--configfile {RepoRootNuGetConfig} --packages \"{fullPath}\""; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new RestoreCommand() .WithWorkingDirectory(projectDirectory) .ExecuteWithCapturedOutput(args) @@ -44,8 +47,10 @@ public void ItRestoresAppToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresLibToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresLibToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = TestAssets.CreateTestDirectory().FullName; @@ -60,6 +65,7 @@ public void ItRestoresLibToSpecificDirectory() .Pass(); string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\""; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) @@ -71,8 +77,10 @@ public void ItRestoresLibToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresTestAppToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresTestAppToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = TestAssets.Get("VSTestCore").CreateInstance().WithSourceFiles().Root.FullName; @@ -80,6 +88,7 @@ public void ItRestoresTestAppToSpecificDirectory() string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\""; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) @@ -91,8 +100,10 @@ public void ItRestoresTestAppToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresWithTheSpecifiedVerbosity() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresWithTheSpecifiedVerbosity(bool useStaticGraphEvaluation) { var rootPath = TestAssets.CreateTestDirectory().FullName; @@ -107,6 +118,7 @@ public void ItRestoresWithTheSpecifiedVerbosity() .Pass(); string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\" --verbosity quiet"; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) @@ -115,5 +127,9 @@ public void ItRestoresWithTheSpecifiedVerbosity() .And.NotHaveStdErr() .And.NotHaveStdOut(); } + + private static string HandleStaticGraphEvaluation(bool useStaticGraphEvaluation, string args) => + useStaticGraphEvaluation ? + args + " /p:RestoreUseStaticGraphEvaluation=true" : args; } } From 8b401055ac5496d17d1bdee86a74ea46cdb8b406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 May 2020 16:48:47 +0000 Subject: [PATCH 740/896] [release/3.1.4xx] Update dependencies from Microsoft/msbuild (#4584) * Update dependencies from https://github.com/microsoft/msbuild build 20200521.1 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20270-03 -> To Version 16.7.0-preview-20271-01 * Update dependencies from https://github.com/microsoft/msbuild build 20200521.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20270-03 -> To Version 16.7.0-preview-20271-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c950c18a61b..5754c77ccfec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk d1248815ac9e6e4210776f95425fd5646c59dece - + https://github.com/microsoft/msbuild - bee129d1b5adaab3826926afb5f54c12e2d4edb4 + 0901979ef341602e31e750db04088f4e7ba09733 - + https://github.com/microsoft/msbuild - bee129d1b5adaab3826926afb5f54c12e2d4edb4 + 0901979ef341602e31e750db04088f4e7ba09733 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b9bf8cf3639f..bc1179bdd6ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20270-03 + 16.7.0-preview-20271-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20270-03 + 16.7.0-preview-20271-02 $(MicrosoftBuildPackageVersion) From a0ae8492d6537e7546294dadeffa9859eb25b3c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 May 2020 19:50:29 +0000 Subject: [PATCH 741/896] Update dependencies from https://github.com/microsoft/msbuild build 20200521.3 (#4585) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20271-02 -> To Version 16.7.0-preview-20271-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5754c77ccfec..5fcdae42c307 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk d1248815ac9e6e4210776f95425fd5646c59dece - + https://github.com/microsoft/msbuild - 0901979ef341602e31e750db04088f4e7ba09733 + ba9a1d64a7abf15a8505827c00413156a3eb7f62 - + https://github.com/microsoft/msbuild - 0901979ef341602e31e750db04088f4e7ba09733 + ba9a1d64a7abf15a8505827c00413156a3eb7f62 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bc1179bdd6ee..81183796f008 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20271-02 + 16.7.0-preview-20271-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20271-02 + 16.7.0-preview-20271-03 $(MicrosoftBuildPackageVersion) From 112cd1f6e31b506668ab15f816110290643fa91c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 May 2020 23:36:24 +0000 Subject: [PATCH 742/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#11696) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6618 NuGet.Build.Tasks From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618 * Update stage 0 * Update global.json Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff Co-authored-by: William Li --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a0fa229dcad..d7a9a9347b41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 12a375a8a02764b772a20371abaf797639a7f961 + 721908c643a7806b630774e76b53e37507fec062 diff --git a/eng/Versions.props b/eng/Versions.props index 2451234be9ef..27cc116c308d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-preview.1.6609 + 5.7.0-preview.2.6618 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 diff --git a/global.json b/global.json index 0cd14bdf4c78..653d157e7a91 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015135", + "dotnet": "3.1.400-preview-015147", "vs-opt": { "version": "15.9" } From bffe1aa46e1bdd47e161822551fee137bcec5318 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 01:20:34 +0000 Subject: [PATCH 743/896] Update dependencies from https://github.com/dotnet/sdk build 20200521.7 (#4586) Microsoft.NET.Sdk From Version 3.1.400-preview.20269.11 -> To Version 3.1.400-preview.20271.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fcdae42c307..727967781a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli d8cfed28fe4625c99a0bfbf438e4359866cbb65a - + https://github.com/dotnet/sdk - d1248815ac9e6e4210776f95425fd5646c59dece + 112cd1f6e31b506668ab15f816110290643fa91c https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 81183796f008..00a358c7877f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20269.11 + 3.1.400-preview.20271.7 From 9347815eaac909dd1fb41df0a73285898727d304 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 03:11:18 +0000 Subject: [PATCH 744/896] Update dependencies from https://github.com/dotnet/sdk build 20200521.7 (#13376) Microsoft.NET.Sdk From Version 3.1.400-preview.20269.11 -> To Version 3.1.400-preview.20271.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bd6e5dbaee2..651c7dcfd442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - d1248815ac9e6e4210776f95425fd5646c59dece + 112cd1f6e31b506668ab15f816110290643fa91c https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index f429664223cb..1fbe5bee4fd1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20269.11 + 3.1.400-preview.20271.7 $(MicrosoftNETSdkPackageVersion) From e4f4874fa943b6f2b4d791929b6b91eecf4f3bd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 03:59:15 +0000 Subject: [PATCH 745/896] Update dependencies from https://github.com/dotnet/cli build 20200521.9 (#4587) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20270.2 -> To Version 3.1.400-preview.20271.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727967781a6b..d44bb751b67d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - d8cfed28fe4625c99a0bfbf438e4359866cbb65a + 9347815eaac909dd1fb41df0a73285898727d304 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 00a358c7877f..26bfd7010d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20270.2 + 3.1.400-preview.20271.9 From cb097a5c577f0b6ba0def926ed947728a784feab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 May 2020 22:00:54 +0000 Subject: [PATCH 746/896] Update dependencies from https://github.com/microsoft/msbuild build 20200526.1 (#4588) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20271-03 -> To Version 16.7.0-preview-20276-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d44bb751b67d..10b6e653ec3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - ba9a1d64a7abf15a8505827c00413156a3eb7f62 + b0d72851842af6f6b50ad62e6e2077790ee5de29 - + https://github.com/microsoft/msbuild - ba9a1d64a7abf15a8505827c00413156a3eb7f62 + b0d72851842af6f6b50ad62e6e2077790ee5de29 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 26bfd7010d87..87629baec3ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20271-03 + 16.7.0-preview-20276-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20271-03 + 16.7.0-preview-20276-01 $(MicrosoftBuildPackageVersion) From 6878ebb37274dce97563c51a31a22a127c7759c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 May 2020 21:14:25 +0000 Subject: [PATCH 747/896] Update dependencies from https://github.com/dotnet/arcade build 20200528.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 30 ++++++++++++++++++++++-------- global.json | 4 ++-- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7a9a9347b41..399869554507 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - ccfddb60fbd3de13463298334f00610edb5f63c6 + 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 - + https://github.com/dotnet/arcade - ccfddb60fbd3de13463298334f00610edb5f63c6 + 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 - + https://github.com/dotnet/arcade - ccfddb60fbd3de13463298334f00610edb5f63c6 + 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 27cc116c308d..47829be5c44b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20269.3 + 1.0.0-beta.20278.5 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index b94c2f4e411d..435e7641341b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,13 +1,14 @@ param ( $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16", - $verbosity = "m" + $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $verbosity = 'minimal', + $toolpath = $null ) . $PSScriptRoot\tools.ps1 -function InstallDarcCli ($darcVersion) { - $darcCliPackageName = "microsoft.dotnet.darc" +function InstallDarcCli ($darcVersion, $toolpath) { + $darcCliPackageName = 'microsoft.dotnet.darc' $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" @@ -23,11 +24,24 @@ function InstallDarcCli ($darcVersion) { $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } - $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' + $arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' Write-Host "Installing Darc CLI version $darcVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 + Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' + if (-not $toolpath) { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + }else { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath" + } } -InstallDarcCli $darcVersion +try { + InstallDarcCli $darcVersion $toolpath +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'Darc' -Message $_ + ExitWithExitCode 1 +} \ No newline at end of file diff --git a/global.json b/global.json index 653d157e7a91..f6d709085b3f 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20269.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20278.5" } } From 86cfb2a2f5f8215bcaaeabd36e0f0fea08442381 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 May 2020 21:14:39 +0000 Subject: [PATCH 748/896] Update dependencies from https://github.com/dotnet/arcade build 20200528.5 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 30 ++++++++++++++++++++++-------- global.json | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10b6e653ec3f..20fd44b47546 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - ccfddb60fbd3de13463298334f00610edb5f63c6 + 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index b94c2f4e411d..435e7641341b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,13 +1,14 @@ param ( $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16", - $verbosity = "m" + $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $verbosity = 'minimal', + $toolpath = $null ) . $PSScriptRoot\tools.ps1 -function InstallDarcCli ($darcVersion) { - $darcCliPackageName = "microsoft.dotnet.darc" +function InstallDarcCli ($darcVersion, $toolpath) { + $darcCliPackageName = 'microsoft.dotnet.darc' $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" @@ -23,11 +24,24 @@ function InstallDarcCli ($darcVersion) { $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } - $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' + $arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' Write-Host "Installing Darc CLI version $darcVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 + Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' + if (-not $toolpath) { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + }else { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath" + } } -InstallDarcCli $darcVersion +try { + InstallDarcCli $darcVersion $toolpath +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'Darc' -Message $_ + ExitWithExitCode 1 +} \ No newline at end of file diff --git a/global.json b/global.json index 2830a510b3d9..2dc636df82f7 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5" } } From a1492753b162638fd84d01b1f9ea8252a4df5243 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 May 2020 21:15:13 +0000 Subject: [PATCH 749/896] Update dependencies from https://github.com/dotnet/arcade build 20200528.5 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 30 ++++++++++++++++++++++-------- global.json | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 651c7dcfd442..7631d061fa85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - ccfddb60fbd3de13463298334f00610edb5f63c6 + 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index b94c2f4e411d..435e7641341b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,13 +1,14 @@ param ( $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16", - $verbosity = "m" + $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $verbosity = 'minimal', + $toolpath = $null ) . $PSScriptRoot\tools.ps1 -function InstallDarcCli ($darcVersion) { - $darcCliPackageName = "microsoft.dotnet.darc" +function InstallDarcCli ($darcVersion, $toolpath) { + $darcCliPackageName = 'microsoft.dotnet.darc' $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" @@ -23,11 +24,24 @@ function InstallDarcCli ($darcVersion) { $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } - $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' + $arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' Write-Host "Installing Darc CLI version $darcVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 + Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' + if (-not $toolpath) { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + }else { + Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath" + } } -InstallDarcCli $darcVersion +try { + InstallDarcCli $darcVersion $toolpath +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'Darc' -Message $_ + ExitWithExitCode 1 +} \ No newline at end of file diff --git a/global.json b/global.json index 31c369ee1b08..69711811fae5 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5" } } From 319cdf3fb3bf015c004efddf97580d463d0a8dd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 May 2020 16:17:20 +0000 Subject: [PATCH 750/896] Update dependencies from https://github.com/microsoft/msbuild build 20200529.1 (#4590) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20276-01 -> To Version 16.7.0-preview-20279-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10b6e653ec3f..4aa1687d61fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - b0d72851842af6f6b50ad62e6e2077790ee5de29 + 974a2369215ff3d99e5cde2f8272b8f5b57a0814 - + https://github.com/microsoft/msbuild - b0d72851842af6f6b50ad62e6e2077790ee5de29 + 974a2369215ff3d99e5cde2f8272b8f5b57a0814 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 87629baec3ee..2ff41986c1e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20276-01 + 16.7.0-preview-20279-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20276-01 + 16.7.0-preview-20279-01 $(MicrosoftBuildPackageVersion) From 8cda80007ae050abe77949abb4553157f3d42a21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 May 2020 16:27:56 +0000 Subject: [PATCH 751/896] Update dependencies from https://github.com/microsoft/msbuild build 20200529.3 (#4591) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20279-01 -> To Version 16.7.0-preview-20279-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aa1687d61fc..e6c2d9474f52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 974a2369215ff3d99e5cde2f8272b8f5b57a0814 + 756efb7a3def80c069bc726d3229ceef144b71c9 - + https://github.com/microsoft/msbuild - 974a2369215ff3d99e5cde2f8272b8f5b57a0814 + 756efb7a3def80c069bc726d3229ceef144b71c9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2ff41986c1e2..ebd03fdb5b15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20279-01 + 16.7.0-preview-20279-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20279-01 + 16.7.0-preview-20279-03 $(MicrosoftBuildPackageVersion) From 7d6f67cb187110b1bf69a0fde3182a81f00afa7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 May 2020 16:28:36 +0000 Subject: [PATCH 752/896] Update dependencies from https://github.com/microsoft/msbuild build 20200529.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-02 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6c2d9474f52..15e00480ddaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 756efb7a3def80c069bc726d3229ceef144b71c9 + 0c7dc8ce962a8d103d1111b2ac6081470cc89a16 - + https://github.com/microsoft/msbuild - 756efb7a3def80c069bc726d3229ceef144b71c9 + 0c7dc8ce962a8d103d1111b2ac6081470cc89a16 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ebd03fdb5b15..3b6a0804a401 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20279-03 + 16.7.0-preview-20279-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20279-03 + 16.7.0-preview-20279-02 $(MicrosoftBuildPackageVersion) From 8d0d9697309bfcda604f53defc6bacf214c05eea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 May 2020 16:35:14 +0000 Subject: [PATCH 753/896] Update dependencies from https://github.com/microsoft/msbuild build 20200529.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15e00480ddaa..de3be79e8bd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 0c7dc8ce962a8d103d1111b2ac6081470cc89a16 + 5ca6771402894e62104bb7291760713d6cc03f3c - + https://github.com/microsoft/msbuild - 0c7dc8ce962a8d103d1111b2ac6081470cc89a16 + 5ca6771402894e62104bb7291760713d6cc03f3c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3b6a0804a401..47795252f2ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20279-02 + 16.7.0-preview-20279-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20279-02 + 16.7.0-preview-20279-04 $(MicrosoftBuildPackageVersion) From fc6048fd869394facb596220e49e0e9dfebc1a12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 May 2020 18:48:01 +0000 Subject: [PATCH 754/896] Update dependencies from https://github.com/microsoft/msbuild build 20200529.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-05 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3be79e8bd8..c1c788be29a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 5ca6771402894e62104bb7291760713d6cc03f3c + a936b97e30679dcea4d99c362efa6f732c9d3587 - + https://github.com/microsoft/msbuild - 5ca6771402894e62104bb7291760713d6cc03f3c + a936b97e30679dcea4d99c362efa6f732c9d3587 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47795252f2ee..b16e0a713450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20279-04 + 16.7.0-preview-20279-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20279-04 + 16.7.0-preview-20279-05 $(MicrosoftBuildPackageVersion) From fefa075b5b038e7303775924a0c5f29beac1b222 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 31 May 2020 17:07:10 -0700 Subject: [PATCH 755/896] Correct tool path append --- .../DotDefaultPathCorrector.cs | 75 +++++ .../IWindowsRegistryEnvironmentPathEditor.cs | 18 ++ .../Microsoft.DotNet.Cli.Utils.csproj | 2 + .../WindowsRegistryEnvironmentPathEditor.cs | 72 +++++ .../CliFolderPathCalculator.cs | 21 +- src/dotnet/Program.cs | 15 +- .../ShellShim/EnvironmentPathFactory.cs | 34 +- .../ShellShim/WindowsEnvironmentPath.cs | 71 +++-- .../DotDefaultPathCorrectorTests.cs | 68 ++++ .../WindowsEnvironmentPathTests.cs | 297 +++++++++++------- 10 files changed, 514 insertions(+), 159 deletions(-) create mode 100644 src/Microsoft.DotNet.Cli.Utils/DotDefaultPathCorrector.cs create mode 100644 src/Microsoft.DotNet.Cli.Utils/IWindowsRegistryEnvironmentPathEditor.cs create mode 100644 src/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs create mode 100644 test/Microsoft.DotNet.Cli.Utils.Tests/DotDefaultPathCorrectorTests.cs diff --git a/src/Microsoft.DotNet.Cli.Utils/DotDefaultPathCorrector.cs b/src/Microsoft.DotNet.Cli.Utils/DotDefaultPathCorrector.cs new file mode 100644 index 000000000000..0391916c3389 --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Utils/DotDefaultPathCorrector.cs @@ -0,0 +1,75 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Microsoft.DotNet.Cli.Utils +{ + /// + /// This class is to correct .default user's PATH caused by https://github.com/dotnet/sdk/issues/9762 + /// It will be run during elevated installer install. + /// For example and the usage reference the test DotDefaultPathCorrectorTests + /// + public static class DotDefaultPathCorrector + { + private const string DotnetToolsSuffix = @"\.dotnet\tools"; + + public static void Correct() + { + var pathEditor = new WindowsRegistryEnvironmentPathEditor(); + var dotDefaultPath = + pathEditor.Get( + SdkEnvironmentVariableTarget.DotDefault); + if (NeedCorrection(dotDefaultPath, out var correctedPath)) + { + pathEditor.Set(correctedPath, + SdkEnvironmentVariableTarget.DotDefault); + } + } + + internal static bool NeedCorrection(string existingPath, out string correctedPath) + { + correctedPath = string.Empty; + if (string.IsNullOrWhiteSpace(existingPath)) + { + return false; + } + + IEnumerable paths = existingPath.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + + var inCorrectToolsPaths = + paths.Where(p => p.EndsWith(DotnetToolsSuffix, StringComparison.OrdinalIgnoreCase)); + + if (!inCorrectToolsPaths.Any()) + { + return false; + } + + var correctedPaths = paths + .Where(p => !p.EndsWith(DotnetToolsSuffix, StringComparison.OrdinalIgnoreCase)) + .Select(p => ReplaceExpandedUserProfile(p, inCorrectToolsPaths)); + + correctedPath = string.Join(";", correctedPaths); + + return true; + } + + private static string ReplaceExpandedUserProfile(string path, IEnumerable inCorrectToolsPaths) + { + foreach (var inCorrectToolsPath in inCorrectToolsPaths) + { + var expandedUserProfile = + inCorrectToolsPath.Substring(0, inCorrectToolsPath.Length - DotnetToolsSuffix.Length); + + if (path.StartsWith(expandedUserProfile, StringComparison.OrdinalIgnoreCase)) + { + return path.Replace(expandedUserProfile, "%USERPROFILE%"); + } + } + + return path; + } + } +} diff --git a/src/Microsoft.DotNet.Cli.Utils/IWindowsRegistryEnvironmentPathEditor.cs b/src/Microsoft.DotNet.Cli.Utils/IWindowsRegistryEnvironmentPathEditor.cs new file mode 100644 index 000000000000..783b03f3d24b --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Utils/IWindowsRegistryEnvironmentPathEditor.cs @@ -0,0 +1,18 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Cli.Utils +{ + internal interface IWindowsRegistryEnvironmentPathEditor + { + string Get(SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget); + void Set(string value, SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget); + } + + internal enum SdkEnvironmentVariableTarget + { + DotDefault, + // the current user could be DotDefault if it is running under System + CurrentUser + } +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index ce3ad7292f91..63a8f6ca8173 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -9,6 +9,7 @@ true true true + true @@ -28,6 +29,7 @@ + diff --git a/src/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs b/src/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs new file mode 100644 index 000000000000..37dc965c36c4 --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs @@ -0,0 +1,72 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Principal; +using Microsoft.DotNet.PlatformAbstractions; +using Microsoft.Win32; + +namespace Microsoft.DotNet.Cli.Utils +{ + internal class WindowsRegistryEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor + { + private static string Path = "PATH"; + public string Get(SdkEnvironmentVariableTarget currentUserBeforeEvaluation) + { + using (RegistryKey environmentKey = OpenEnvironmentKeyIfExists(writable: false, sdkEnvironmentVariableTarget: currentUserBeforeEvaluation)) + { + return environmentKey?.GetValue(Path, "", RegistryValueOptions.DoNotExpandEnvironmentNames) as string; + } + } + + public void Set(string value, SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget) + { + using (RegistryKey environmentKey = OpenEnvironmentKeyIfExists(writable: true, sdkEnvironmentVariableTarget: sdkEnvironmentVariableTarget)) + { + environmentKey?.SetValue(Path, value, RegistryValueKind.ExpandString); + } + + unsafe + { + // send a WM_SETTINGCHANGE message to all windows + fixed (char* lParam = "Environment") + { + IntPtr r = SendMessageTimeout(new IntPtr(HWND_BROADCAST), WM_SETTINGCHANGE, IntPtr.Zero, (IntPtr)lParam, 0, 1000, out IntPtr _); + } + } + } + + private static RegistryKey OpenEnvironmentKeyIfExists(bool writable, SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget) + { + RegistryKey baseKey; + string keyName; + + if (sdkEnvironmentVariableTarget == SdkEnvironmentVariableTarget.CurrentUser) + { + baseKey = Registry.CurrentUser; + keyName = "Environment"; + } + else if (sdkEnvironmentVariableTarget == SdkEnvironmentVariableTarget.DotDefault) + { + baseKey = Registry.Users; + keyName = ".DEFAULT\\Environment"; + } + else + { + throw new ArgumentException(nameof(sdkEnvironmentVariableTarget) + " cannot be matched, the value is: " + sdkEnvironmentVariableTarget.ToString()); + } + + return baseKey.OpenSubKey(keyName, writable: writable); + } + + [DllImport("user32.dll", EntryPoint = "SendMessageTimeoutW")] + private static extern IntPtr SendMessageTimeout(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, int flags, int timeout, out IntPtr pdwResult); + + private const int HWND_BROADCAST = 0xffff; + private const int WM_SETTINGCHANGE = 0x001A; + } +} diff --git a/src/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs b/src/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs index 9cdc092182d3..9f2f06e98e25 100644 --- a/src/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs +++ b/src/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs @@ -18,17 +18,28 @@ public static class CliFolderPathCalculator public static string CliFallbackFolderPath => Environment.GetEnvironmentVariable("DOTNET_CLI_TEST_FALLBACKFOLDER") ?? - Path.Combine(new DirectoryInfo(AppContext.BaseDirectory).Parent.FullName, "NuGetFallbackFolder"); + Path.Combine(new DirectoryInfo(AppContext.BaseDirectory).Parent.FullName, "NuGetFallbackFolder"); public static string ToolsShimPath => Path.Combine(DotnetUserProfileFolderPath, ToolsShimFolderName); - public static string ToolsPackagePath => ToolPackageFolderPathCalculator.GetToolPackageFolderPath(ToolsShimPath); + public static string ToolsPackagePath => + ToolPackageFolderPathCalculator.GetToolPackageFolderPath(ToolsShimPath); public static BashPathUnderHomeDirectory ToolsShimPathInUnix => new BashPathUnderHomeDirectory( DotnetHomePath, Path.Combine(DotnetProfileDirectoryName, ToolsShimFolderName)); + public static string WindowsNonExpandedToolsShimPath + { + get + { + return string.IsNullOrEmpty(Environment.GetEnvironmentVariable(DotnetHomeVariableName)) + ? $@"%USERPROFILE%\{DotnetProfileDirectoryName}\{ToolsShimFolderName}" + : ToolsShimPath; + } + } + public static string DotnetUserProfileFolderPath => Path.Combine(DotnetHomePath, DotnetProfileDirectoryName); @@ -48,9 +59,9 @@ public static string DotnetHomePath if (string.IsNullOrEmpty(home)) { throw new ConfigurationException( - string.Format( - LocalizableStrings.FailedToDetermineUserHomeDirectory, - DotnetHomeVariableName)) + string.Format( + LocalizableStrings.FailedToDetermineUserHomeDirectory, + DotnetHomeVariableName)) .DisplayAsError(); } } diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 46d44d800e29..626e51de8994 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -156,13 +156,13 @@ internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null ReportDotnetHomeUsage(environmentProvider); topLevelCommandParserResult = new TopLevelCommandParserResult(command); - var hasSuperUserAccess = false; + var isDotnetBeingInvokedFromNativeInstaller = false; if (IsDotnetBeingInvokedFromNativeInstaller(topLevelCommandParserResult)) { aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel(); firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel(); toolPathSentinel = new NoOpFileSentinel(exists: false); - hasSuperUserAccess = true; + isDotnetBeingInvokedFromNativeInstaller = true; } var dotnetFirstRunConfiguration = new DotnetFirstRunConfiguration( @@ -175,7 +175,7 @@ internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null firstTimeUseNoticeSentinel, aspNetCertificateSentinel, toolPathSentinel, - hasSuperUserAccess, + isDotnetBeingInvokedFromNativeInstaller, dotnetFirstRunConfiguration, environmentProvider); @@ -257,13 +257,13 @@ private static void ConfigureDotNetForFirstTimeUse( IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel, IAspNetCertificateSentinel aspNetCertificateSentinel, IFileSentinel toolPathSentinel, - bool hasSuperUserAccess, + bool isDotnetBeingInvokedFromNativeInstaller, DotnetFirstRunConfiguration dotnetFirstRunConfiguration, IEnvironmentProvider environmentProvider) { using (PerfTrace.Current.CaptureTiming()) { - var environmentPath = EnvironmentPathFactory.CreateEnvironmentPath(hasSuperUserAccess, environmentProvider); + var environmentPath = EnvironmentPathFactory.CreateEnvironmentPath(isDotnetBeingInvokedFromNativeInstaller, environmentProvider); var commandFactory = new DotNetCommandFactory(alwaysRunOutOfProc: true); var aspnetCertificateGenerator = new AspNetCoreCertificateGenerator(); var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( @@ -277,6 +277,11 @@ private static void ConfigureDotNetForFirstTimeUse( environmentPath); dotnetConfigurer.Configure(); + + if (isDotnetBeingInvokedFromNativeInstaller && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + DotDefaultPathCorrector.Correct(); + } } } diff --git a/src/dotnet/ShellShim/EnvironmentPathFactory.cs b/src/dotnet/ShellShim/EnvironmentPathFactory.cs index ffb1b0e14f4f..b1eabd4e9b68 100644 --- a/src/dotnet/ShellShim/EnvironmentPathFactory.cs +++ b/src/dotnet/ShellShim/EnvironmentPathFactory.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.ShellShim internal static class EnvironmentPathFactory { public static IEnvironmentPath CreateEnvironmentPath( - bool hasSuperUserAccess = false, + bool isDotnetBeingInvokedFromNativeInstaller = false, IEnvironmentProvider environmentProvider = null) { if (environmentProvider == null) @@ -25,12 +25,22 @@ public static IEnvironmentPath CreateEnvironmentPath( IEnvironmentPath environmentPath = new DoNothingEnvironmentPath(); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - environmentPath = new WindowsEnvironmentPath( - CliFolderPathCalculator.ToolsShimPath, - Reporter.Output, - environmentProvider); + if (isDotnetBeingInvokedFromNativeInstaller) + { + // On Windows MSI will in charge of appending ToolShimPath + environmentPath = new DoNothingEnvironmentPath(); + } + else + { + environmentPath = new WindowsEnvironmentPath( + CliFolderPathCalculator.ToolsShimPath, + CliFolderPathCalculator.WindowsNonExpandedToolsShimPath, + environmentProvider, + new WindowsRegistryEnvironmentPathEditor(), + Reporter.Output); + } } - else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && hasSuperUserAccess) + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && isDotnetBeingInvokedFromNativeInstaller) { environmentPath = new LinuxEnvironmentPath( CliFolderPathCalculator.ToolsShimPathInUnix, @@ -38,7 +48,7 @@ public static IEnvironmentPath CreateEnvironmentPath( environmentProvider, new FileWrapper()); } - else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && hasSuperUserAccess) + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && isDotnetBeingInvokedFromNativeInstaller) { environmentPath = new OsxBashEnvironmentPath( executablePath: CliFolderPathCalculator.ToolsShimPathInUnix, @@ -66,6 +76,16 @@ public static IEnvironmentPathInstruction CreateEnvironmentPathInstruction( environmentProvider: environmentProvider); } + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return new WindowsEnvironmentPath( + CliFolderPathCalculator.ToolsShimPath, + nonExpandedPackageExecutablePath: CliFolderPathCalculator.WindowsNonExpandedToolsShimPath, + expandedEnvironmentReader: environmentProvider, + environmentPathEditor: new WindowsRegistryEnvironmentPathEditor(), + reporter: Reporter.Output); + } + return CreateEnvironmentPath(true, environmentProvider); } } diff --git a/src/dotnet/ShellShim/WindowsEnvironmentPath.cs b/src/dotnet/ShellShim/WindowsEnvironmentPath.cs index 7ac51cc6f0a6..d8121bd05260 100644 --- a/src/dotnet/ShellShim/WindowsEnvironmentPath.cs +++ b/src/dotnet/ShellShim/WindowsEnvironmentPath.cs @@ -13,14 +13,38 @@ internal class WindowsEnvironmentPath : IEnvironmentPath { private readonly IReporter _reporter; private const string PathName = "PATH"; - private readonly string _packageExecutablePath; - private readonly IEnvironmentProvider _environmentProvider; + private readonly string _expandedPackageExecutablePath; + private readonly string _nonExpandedPackageExecutablePath; - public WindowsEnvironmentPath(string packageExecutablePath, IReporter reporter, IEnvironmentProvider environmentProvider) + /// + /// This will read cached and expanded environment variable. We use this + /// to check if the expanded tool shim path exists. Since this is ultimately how shell will invoke command + /// + private readonly IEnvironmentProvider _expandedEnvironmentReader; + + /// + /// This will read from registry with non expanded environment like %USERPROFILE%\AppData\Local\Microsoft\WindowsApps + /// when append tool shim PATH. Use to read and write to avoid edit existing PATH. + /// + private readonly IWindowsRegistryEnvironmentPathEditor _environmentPathEditor; + + public WindowsEnvironmentPath(string packageExecutablePath, + string nonExpandedPackageExecutablePath, + IEnvironmentProvider expandedEnvironmentReader, + IWindowsRegistryEnvironmentPathEditor environmentPathEditor, + IReporter reporter) { - _packageExecutablePath = packageExecutablePath ?? throw new ArgumentNullException(nameof(packageExecutablePath)); + _nonExpandedPackageExecutablePath = nonExpandedPackageExecutablePath ?? + throw new ArgumentNullException(nameof(packageExecutablePath)); + _expandedPackageExecutablePath = + packageExecutablePath ?? throw new ArgumentNullException(nameof(packageExecutablePath)); _reporter = reporter ?? throw new ArgumentNullException(nameof(reporter)); - _environmentProvider = environmentProvider ?? throw new ArgumentNullException(nameof(environmentProvider)); + + _expandedEnvironmentReader = + expandedEnvironmentReader ?? throw new ArgumentNullException(nameof(expandedEnvironmentReader)); + + _environmentPathEditor = + environmentPathEditor ?? throw new ArgumentNullException(nameof(environmentPathEditor)); } public void AddPackageExecutablePathToUserPath() @@ -30,16 +54,16 @@ public void AddPackageExecutablePathToUserPath() return; } - var existingUserEnvPath = _environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User); + var existingUserEnvPath = + _environmentPathEditor.Get(SdkEnvironmentVariableTarget.CurrentUser); try { if (existingUserEnvPath == null) { - _environmentProvider.SetEnvironmentVariable( - PathName, - _packageExecutablePath, - EnvironmentVariableTarget.User); + _environmentPathEditor.Set( + _nonExpandedPackageExecutablePath, + SdkEnvironmentVariableTarget.CurrentUser); } else { @@ -48,10 +72,9 @@ public void AddPackageExecutablePathToUserPath() existingUserEnvPath = existingUserEnvPath.Substring(0, (existingUserEnvPath.Length - 1)); } - _environmentProvider.SetEnvironmentVariable( - PathName, - $"{existingUserEnvPath};{_packageExecutablePath}", - EnvironmentVariableTarget.User); + _environmentPathEditor.Set( + $"{existingUserEnvPath};{_nonExpandedPackageExecutablePath}", + SdkEnvironmentVariableTarget.CurrentUser); } } catch (System.Security.SecurityException) @@ -59,27 +82,31 @@ public void AddPackageExecutablePathToUserPath() _reporter.WriteLine( string.Format( CommonLocalizableStrings.FailedToSetToolsPathEnvironmentVariable, - _packageExecutablePath).Yellow()); + _expandedPackageExecutablePath).Yellow()); } } private bool PackageExecutablePathExists() { - return PackageExecutablePathExistsForCurrentProcess() || PackageExecutablePathWillExistForFutureNewProcess(); + return PackageExecutablePathExistsForCurrentProcess() || + PackageExecutablePathWillExistForFutureNewProcess(); } private bool PackageExecutablePathWillExistForFutureNewProcess() { - return EnvironmentVariableContainsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User)) - || EnvironmentVariableContainsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Machine)); + return EnvironmentVariableConatinsPackageExecutablePath( + _expandedEnvironmentReader.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User)) + || EnvironmentVariableConatinsPackageExecutablePath( + _expandedEnvironmentReader.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Machine)); } private bool PackageExecutablePathExistsForCurrentProcess() { - return EnvironmentVariableContainsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Process)); + return EnvironmentVariableConatinsPackageExecutablePath( + _expandedEnvironmentReader.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Process)); } - private bool EnvironmentVariableContainsPackageExecutablePath(string environmentVariable) + private bool EnvironmentVariableConatinsPackageExecutablePath(string environmentVariable) { if (environmentVariable == null) { @@ -88,7 +115,7 @@ private bool EnvironmentVariableContainsPackageExecutablePath(string environment return environmentVariable .Split(';') - .Any(p => string.Equals(p, _packageExecutablePath, StringComparison.OrdinalIgnoreCase)); + .Any(p => string.Equals(p, _expandedPackageExecutablePath, StringComparison.OrdinalIgnoreCase)); } public void PrintAddPathInstructionIfPathDoesNotExist() @@ -102,7 +129,7 @@ public void PrintAddPathInstructionIfPathDoesNotExist() _reporter.WriteLine( string.Format( CommonLocalizableStrings.EnvironmentPathWindowsManualInstructions, - _packageExecutablePath)); + _expandedPackageExecutablePath)); } } } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/DotDefaultPathCorrectorTests.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/DotDefaultPathCorrectorTests.cs new file mode 100644 index 000000000000..c6fbf6dcae78 --- /dev/null +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/DotDefaultPathCorrectorTests.cs @@ -0,0 +1,68 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using FluentAssertions; +using Microsoft.DotNet.Tools.Common; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace Microsoft.DotNet.Cli.Utils +{ + public class DotDefaultPathCorrectorTests + { + [Fact] + public void ItCanCorrectDotDefaultPath() + { + var existingPath = @"C:\Users\myname\AppData\Local\Microsoft\WindowsApps;C:\Users\myname\.dotnet\tools"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string correctPath).Should().BeTrue(); + correctPath.Should().Be(@"%USERPROFILE%\AppData\Local\Microsoft\WindowsApps"); + } + + [Fact] + public void ItCanTellNoCorrectionNeeded() + { + var existingPath = @"C:\Users\myname\AppData\Local\Microsoft\WindowsApps;"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string _).Should().BeFalse(); + } + + [Fact] + public void GivenEmptyItCanTellNoCorrectionNeeded() + { + var existingPath = ""; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string _).Should().BeFalse(); + } + + [Fact] + public void GivenSubsequencePathItCanCorrectDotDefaultPath() + { + var existingPath = + @"C:\Users\myname\AppData\Local\Microsoft\WindowsApps;C:\Users\myname\.dotnet\tools;C:\Users\myname\other;"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string correctPath).Should().BeTrue(); + correctPath.Should().Be(@"%USERPROFILE%\AppData\Local\Microsoft\WindowsApps;%USERPROFILE%\other"); + } + + [Fact] + public void GivenSubsequencePathWithExtraFormatItCanCorrectDotDefaultPath() + { + var existingPath = + @";C:\Users\myname\AppData\Local\Microsoft\WindowsApps;C:\Users\myname\.dotnet\tools;C:\Users\myname\other;;"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string correctPath).Should().BeTrue(); + correctPath.Should().Be(@"%USERPROFILE%\AppData\Local\Microsoft\WindowsApps;%USERPROFILE%\other"); + } + + [Fact] + public void GivenNoToolPathItCanTellNoCorrectionNeeded() + { + var existingPath = @"C:\Users\myname\AppData\Local\Microsoft\WindowsApps;C:\Users\myname\other"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string _).Should().BeFalse(); + } + + [Fact] + public void Given2InstallationItCanCorrectDotDefaultPath() + { + var existingPath = @"C:\Users\user1\AppData\Local\Microsoft\WindowsApps;C:\Users\user2\AppData\otherapp;C:\Users\user1\.dotnet\tools;C:\Users\user2\.dotnet\tools"; + DotDefaultPathCorrector.NeedCorrection(existingPath, out string correctPath).Should().BeTrue(); + correctPath.Should().Be(@"%USERPROFILE%\AppData\Local\Microsoft\WindowsApps;%USERPROFILE%\AppData\otherapp"); + } + } +} diff --git a/test/Microsoft.DotNet.ShellShim.Tests/WindowsEnvironmentPathTests.cs b/test/Microsoft.DotNet.ShellShim.Tests/WindowsEnvironmentPathTests.cs index b6424c127c39..953692b86fe3 100644 --- a/test/Microsoft.DotNet.ShellShim.Tests/WindowsEnvironmentPathTests.cs +++ b/test/Microsoft.DotNet.ShellShim.Tests/WindowsEnvironmentPathTests.cs @@ -2,174 +2,231 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Test.Utilities; -using Moq; using Xunit; namespace Microsoft.DotNet.ShellShim.Tests { public class WindowsEnvironmentPathTests { + public WindowsEnvironmentPathTests() + { + _reporter = new BufferedReporter(); + _mockPathInternal = new MockPathInternal(); + var mockEnvironmentProvider = new MockEnvironmentProvider(_mockPathInternal); + var mockEnvironmentPathEditor = new MockEnvironmentPathEditor(_mockPathInternal); + _windowsEnvironmentPath = new WindowsEnvironmentPath( + _toolsPath, + CliFolderPathCalculator.WindowsNonExpandedToolsShimPath, + mockEnvironmentProvider, + mockEnvironmentPathEditor, + _reporter + ); + } + + private readonly BufferedReporter _reporter; + private readonly WindowsEnvironmentPath _windowsEnvironmentPath; + private readonly MockPathInternal _mockPathInternal; + private const string _toolsPath = @"C:\Users\username\.dotnet\tools"; + [Fact] - public void GivenPathNotSetItPrintsManualInstructions() + public void GivenPathIsNullItItAddsToEnvironment() { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); + _mockPathInternal.UserLevelPath = null; + + _windowsEnvironmentPath.AddPackageExecutablePathToUserPath(); - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.Process || - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue); + _reporter.Lines.Should().BeEmpty(); + _mockPathInternal.UserLevelPath.Should().Be(@"%USERPROFILE%\.dotnet\tools"); + } - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); + [Fact] + public void GivenPathNotSetInProcessItPrintsReopenNoticeAndNoChangeInEnvironment() + { + _mockPathInternal.UserLevelPath = @"%USERPROFILE%\.dotnet\tools"; - environmentPath.PrintAddPathInstructionIfPathDoesNotExist(); + _windowsEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist(); - reporter.Lines.Should().Equal( - string.Format( - CommonLocalizableStrings.EnvironmentPathWindowsManualInstructions, - toolsPath)); + _reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathWindowsNeedReopen); } [Fact] - public void GivenPathNotSetInProcessItPrintsReopenNotice() + public void GivenPathNotSetInProcessWhenAddPackageExecutablePathToUserPathItPrintsReopenNoticeAndNoChangeInEnvironment() { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); + _mockPathInternal.UserLevelPath = @"%USERPROFILE%\Other;%USERPROFILE%\.dotnet\tools"; - provider - .Setup(p => p.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process)) - .Returns(pathValue); + _windowsEnvironmentPath.AddPackageExecutablePathToUserPath(); - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue + ";" + toolsPath); + _reporter.Lines.Should().BeEmpty("No message since this happens in first run experience"); + _mockPathInternal.UserLevelPath.Should() + .Be(@"%USERPROFILE%\Other;%USERPROFILE%\.dotnet\tools", "no change"); + } - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); + [Fact] + public void GivenPathNotSetItAddsToEnvironment() + { + _mockPathInternal.UserLevelPath = @"%USERPROFILE%\Other"; - environmentPath.PrintAddPathInstructionIfPathDoesNotExist(); + _windowsEnvironmentPath.AddPackageExecutablePathToUserPath(); - reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathWindowsNeedReopen); + _reporter.Lines.Should().BeEmpty(); + _mockPathInternal.UserLevelPath.Should().Be(@"%USERPROFILE%\Other;%USERPROFILE%\.dotnet\tools"); } [Fact] - public void GivenPathSetInProcessAndEnvironmentItPrintsNothing() + public void GivenPathNotSetItPrintsManualInstructions() { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); + _mockPathInternal.UserLevelPath = @"%USERPROFILE%\Other"; + _windowsEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist(); - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.Process || - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue + ";" + toolsPath); + _reporter.Lines.Should().Equal( + string.Format( + CommonLocalizableStrings.EnvironmentPathWindowsManualInstructions, + _toolsPath)); + } - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); + [Fact] + public void GivenPathSetInProcessAndEnvironmentItPrintsNothingAndNoChangeInEnvironment() + { + var pathWithToolPath = @"%USERPROFILE%\Other;%USERPROFILE%\.dotnet\tools"; + _mockPathInternal.UserLevelPath = pathWithToolPath; + _mockPathInternal.ProcessLevelPath = pathWithToolPath; - environmentPath.PrintAddPathInstructionIfPathDoesNotExist(); + _windowsEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist(); - reporter.Lines.Should().BeEmpty(); + _reporter.Lines.Should().BeEmpty(); } [Fact] public void GivenPathSetItDoesNotAddPathToEnvironment() { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); + var pathWithToolPath = @"%USERPROFILE%\Other;%USERPROFILE%\.dotnet\tools"; + _mockPathInternal.UserLevelPath = pathWithToolPath; + _mockPathInternal.ProcessLevelPath = pathWithToolPath; - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.Process || - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue + ";" + toolsPath); + _windowsEnvironmentPath.AddPackageExecutablePathToUserPath(); - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); - - environmentPath.AddPackageExecutablePathToUserPath(); + _reporter.Lines.Should().BeEmpty(); + _mockPathInternal.UserLevelPath.Should().Be(pathWithToolPath, "no change"); + } - reporter.Lines.Should().BeEmpty(); + private class MockPathInternal + { + public string MachineLevelPath { get; set; } + public string UserLevelPath { get; set; } + public string ProcessLevelPath { get; set; } } - [Fact] - public void GivenPathNotSetItAddsToEnvironment() + private class MockEnvironmentProvider : IEnvironmentProvider { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); - - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.Process || - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue); - provider - .Setup(p => p.SetEnvironmentVariable("PATH", pathValue + ";" + toolsPath, EnvironmentVariableTarget.User)); - - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); - - environmentPath.AddPackageExecutablePathToUserPath(); - - reporter.Lines.Should().BeEmpty(); + private readonly MockPathInternal _mockPathInternal; + + public MockEnvironmentProvider(MockPathInternal mockPathInternal) + { + _mockPathInternal = mockPathInternal ?? throw new ArgumentNullException(nameof(mockPathInternal)); + } + + public IEnumerable ExecutableExtensions { get; } + + public string GetCommandPath(string commandName, params string[] extensions) + { + throw new NotImplementedException(); + } + + public string GetCommandPathFromRootPath(string rootPath, string commandName, params string[] extensions) + { + throw new NotImplementedException(); + } + + public string GetCommandPathFromRootPath(string rootPath, string commandName, + IEnumerable extensions) + { + throw new NotImplementedException(); + } + + public bool GetEnvironmentVariableAsBool(string name, bool defaultValue) + { + throw new NotImplementedException(); + } + + public string GetEnvironmentVariable(string name) + { + throw new NotImplementedException(); + } + + public string GetEnvironmentVariable(string variable, EnvironmentVariableTarget target) + { + if (variable != "PATH") + { + throw new ArgumentException("should only read PATH"); + } + + switch (target) + { + case EnvironmentVariableTarget.Process: + return Expand(_mockPathInternal.ProcessLevelPath); + case EnvironmentVariableTarget.User: + return Expand(_mockPathInternal.UserLevelPath); + case EnvironmentVariableTarget.Machine: + return Expand(_mockPathInternal.MachineLevelPath); + default: + throw new ArgumentOutOfRangeException(nameof(target), target, null); + } + } + + public void SetEnvironmentVariable(string variable, string value, EnvironmentVariableTarget target) + { + throw new NotImplementedException(); + } + + private static string Expand(string path) + { + return path?.Replace("%USERPROFILE%", @"C:\Users\username"); + } } - [Fact] - public void GivenSecurityExceptionItPrintsWarning() + private class MockEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor { - var reporter = new BufferedReporter(); - var toolsPath = @"C:\Tools"; - var pathValue = @"C:\Other"; - var provider = new Mock(MockBehavior.Strict); - - provider - .Setup(p => p.GetEnvironmentVariable( - "PATH", - It.Is(t => - t == EnvironmentVariableTarget.Process || - t == EnvironmentVariableTarget.User || - t == EnvironmentVariableTarget.Machine))) - .Returns(pathValue); - provider - .Setup(p => p.SetEnvironmentVariable("PATH", pathValue + ";" + toolsPath, EnvironmentVariableTarget.User)) - .Throws(new System.Security.SecurityException()); - - var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object); - - environmentPath.AddPackageExecutablePathToUserPath(); - - reporter.Lines.Should().Equal( - string.Format( - CommonLocalizableStrings.FailedToSetToolsPathEnvironmentVariable, - toolsPath).Yellow()); + private readonly MockPathInternal _mockPathInternal; + + public MockEnvironmentPathEditor(MockPathInternal mockPathInternal) + { + _mockPathInternal = mockPathInternal; + } + + public string Get(SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget) + { + switch (sdkEnvironmentVariableTarget) + { + case SdkEnvironmentVariableTarget.DotDefault: + return ""; + case SdkEnvironmentVariableTarget.CurrentUser: + return _mockPathInternal.UserLevelPath; + default: + throw new ArgumentOutOfRangeException(nameof(sdkEnvironmentVariableTarget), + sdkEnvironmentVariableTarget, null); + } + } + + public void Set(string value, SdkEnvironmentVariableTarget sdkEnvironmentVariableTarget) + { + switch (sdkEnvironmentVariableTarget) + { + case SdkEnvironmentVariableTarget.DotDefault: + throw new ApplicationException("Should never touch DotDefault's EnvironmentVariable."); + case SdkEnvironmentVariableTarget.CurrentUser: + _mockPathInternal.UserLevelPath = value; + break; + default: + throw new ArgumentOutOfRangeException(nameof(sdkEnvironmentVariableTarget), + sdkEnvironmentVariableTarget, null); + } + } } } } From 9ccecd5c145507ecfdeabf952f16d0c7a47b7964 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 17:31:31 +0000 Subject: [PATCH 756/896] Update dependencies from https://github.com/dotnet/cli build 20200601.1 (#4593) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20271.9 -> To Version 3.1.400-preview.20301.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1c788be29a7..40642664f573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 9347815eaac909dd1fb41df0a73285898727d304 + df651f8b833448cfe57cad49e1a36d91631d5d2f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b16e0a713450..11ac8c734c19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20271.9 + 3.1.400-preview.20301.1 From c92a7d6a5020bdcbacbfda155d12437fbd13a263 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 00:58:13 +0000 Subject: [PATCH 757/896] Update dependencies from https://github.com/dotnet/arcade build 20200601.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20301.10 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/post-build/post-build.yml | 12 ++++++++++++ global.json | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 399869554507..96651391d0d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 + e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 - + https://github.com/dotnet/arcade - 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 + e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 - + https://github.com/dotnet/arcade - 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 + e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 47829be5c44b..2610be6a7520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20278.5 + 1.0.0-beta.20301.10 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index f145305b8a67..e1cff6e70298 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -354,3 +354,15 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_Master_Publishing' + channelName: 'VS Master' + channelId: 1012 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index f6d709085b3f..7683ad36d630 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20278.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20301.10" } } From 9e0b0d1f327e25912a2eef2dc2afce6069152fa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 00:58:28 +0000 Subject: [PATCH 758/896] Update dependencies from https://github.com/dotnet/arcade build 20200601.10 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20301.10 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/post-build/post-build.yml | 12 ++++++++++++ global.json | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20fd44b47546..c94cd59343e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 + e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index f145305b8a67..e1cff6e70298 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -354,3 +354,15 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_Master_Publishing' + channelName: 'VS Master' + channelId: 1012 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 2dc636df82f7..22cdd532c7fc 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10" } } From d65cbad6ef98bace3529424f3cb9e8c411931e7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 00:58:28 +0000 Subject: [PATCH 759/896] Update dependencies from https://github.com/dotnet/arcade build 20200601.10 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20301.10 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/post-build/post-build.yml | 12 ++++++++++++ global.json | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7631d061fa85..2ccb1000d72b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 77bfd5a60e0691b0cebd180a0fd85eb65fa7f362 + e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index f145305b8a67..e1cff6e70298 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -354,3 +354,15 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_Master_Publishing' + channelName: 'VS Master' + channelId: 1012 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 69711811fae5..d1c2661d7be9 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10" } } From 054a13168bbd8cf048145279caf8b7f0dd4c68c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 23:06:42 +0000 Subject: [PATCH 760/896] Update dependencies from https://github.com/dotnet/arcade build 20200602.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20302.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96651391d0d7..964b0651aee7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 + 9b71be0663493cd0e111b55536a2e1eeb272f54c - + https://github.com/dotnet/arcade - e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 + 9b71be0663493cd0e111b55536a2e1eeb272f54c - + https://github.com/dotnet/arcade - e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 + 9b71be0663493cd0e111b55536a2e1eeb272f54c https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 2610be6a7520..b20945f6f663 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20301.10 + 1.0.0-beta.20302.3 diff --git a/global.json b/global.json index 7683ad36d630..ea293c9f509f 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20301.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20302.3" } } From 5fddd505e9a0979ab675530ff4ccf0a9fff6d9f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 23:06:57 +0000 Subject: [PATCH 761/896] Update dependencies from https://github.com/dotnet/arcade build 20200602.3 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20302.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c94cd59343e2..45f16bbd881f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 + 9b71be0663493cd0e111b55536a2e1eeb272f54c diff --git a/global.json b/global.json index 22cdd532c7fc..12fbae0ed95c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3" } } From 72b2f1ef995e36448590c442296dd8315b058cf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2020 23:07:00 +0000 Subject: [PATCH 762/896] Update dependencies from https://github.com/dotnet/arcade build 20200602.3 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20302.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ccb1000d72b..c8805a89767c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - e4cb18bd64d291e5dc34e2f77317c33d5022a6b8 + 9b71be0663493cd0e111b55536a2e1eeb272f54c diff --git a/global.json b/global.json index d1c2661d7be9..55aea45a4b53 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3" } } From 9205f10dfded16d32f6fe78c9023c97c34cb61d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:39:57 +0000 Subject: [PATCH 763/896] Update dependencies from https://github.com/microsoft/msbuild build 20200604.2 (#4595) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20279-05 -> To Version 16.7.0-preview-20304-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40642664f573..eaced09bf997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - a936b97e30679dcea4d99c362efa6f732c9d3587 + 1a7e48aa4f3dd7be089d76f136f0fb4dc2ccfe23 - + https://github.com/microsoft/msbuild - a936b97e30679dcea4d99c362efa6f732c9d3587 + 1a7e48aa4f3dd7be089d76f136f0fb4dc2ccfe23 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 681c3a4ad0d2..d1d5948da8b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20279-05 + 16.7.0-preview-20304-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20279-05 + 16.7.0-preview-20304-02 $(MicrosoftBuildPackageVersion) From 4de7c1617bc900a8c2ee235c78a47c6f6786a282 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2020 21:02:21 +0000 Subject: [PATCH 764/896] [release/3.1.4xx] Update dependencies from dotnet/fsharp (#4594) * Update dependencies from https://github.com/dotnet/fsharp build 20200603.12 Microsoft.FSharp.Compiler From Version 10.10.0-beta.20263.1 -> To Version 10.10.0-beta.20303.12 * Update dependencies from https://github.com/dotnet/fsharp build 20200604.1 Microsoft.FSharp.Compiler From Version 10.10.0-beta.20263.1 -> To Version 10.10.0-beta.20304.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eaced09bf997..bb51368fca63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 1a7e48aa4f3dd7be089d76f136f0fb4dc2ccfe23 - + https://github.com/dotnet/fsharp - e6f02c152a5f37333d94a70e3fa3c6cd51720b9f + 7673d5e78eca5bccb77a7e4561c9d9429bdc5f35 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d1d5948da8b5..d67794ab8b11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20263.1 + 10.10.0-beta.20304.1 From 1ae26877e4d06d2e6a54e7975f5108cffb5f1740 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2020 21:36:54 +0000 Subject: [PATCH 765/896] Update dependencies from https://github.com/microsoft/msbuild build 20200604.7 (#4596) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20304-02 -> To Version 16.7.0-preview-20304-07 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb51368fca63..1119f70304f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 1a7e48aa4f3dd7be089d76f136f0fb4dc2ccfe23 + 93fec27d7168675a369729446ad96aaaaa84137f - + https://github.com/microsoft/msbuild - 1a7e48aa4f3dd7be089d76f136f0fb4dc2ccfe23 + 93fec27d7168675a369729446ad96aaaaa84137f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d67794ab8b11..b2fdd694e5ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20304-02 + 16.7.0-preview-20304-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20304-02 + 16.7.0-preview-20304-07 $(MicrosoftBuildPackageVersion) From 8905b67c03588e789d13a3bcc74d1550f961e37c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 15:40:47 +0000 Subject: [PATCH 766/896] Update dependencies from https://github.com/microsoft/msbuild build 20200605.3 (#4597) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20304-07 -> To Version 16.7.0-preview-20305-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1119f70304f2..2eda04a72a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 93fec27d7168675a369729446ad96aaaaa84137f + 14cc8f4883c79e98a6e97a83124a8a8f1b0b438e - + https://github.com/microsoft/msbuild - 93fec27d7168675a369729446ad96aaaaa84137f + 14cc8f4883c79e98a6e97a83124a8a8f1b0b438e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b2fdd694e5ec..c2aeb5121a7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20304-07 + 16.7.0-preview-20305-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20304-07 + 16.7.0-preview-20305-03 $(MicrosoftBuildPackageVersion) From b7405a10b142fc959a8e5f4eec6aa082121d5eb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 15:53:12 +0000 Subject: [PATCH 767/896] Update dependencies from https://github.com/microsoft/msbuild build 20200605.4 (#4598) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20305-03 -> To Version 16.7.0-preview-20305-04 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eda04a72a44..e9f0800c44bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 14cc8f4883c79e98a6e97a83124a8a8f1b0b438e + e8436d518ec9eb1986dfef736fc8f3e9640dae17 - + https://github.com/microsoft/msbuild - 14cc8f4883c79e98a6e97a83124a8a8f1b0b438e + e8436d518ec9eb1986dfef736fc8f3e9640dae17 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c2aeb5121a7e..0e49d7d8cdac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20305-03 + 16.7.0-preview-20305-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20305-03 + 16.7.0-preview-20305-04 $(MicrosoftBuildPackageVersion) From 7d5cb924709062398a959cf929e596f36c7cccb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 20:19:14 +0000 Subject: [PATCH 768/896] Update dependencies from https://github.com/microsoft/msbuild build 20200605.5 (#4599) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20305-04 -> To Version 16.7.0-preview-20305-05 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9f0800c44bb..6e8a1b514478 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - e8436d518ec9eb1986dfef736fc8f3e9640dae17 + 0c98b3aa974a407bb6136e1cb3a1bcd35469c709 - + https://github.com/microsoft/msbuild - e8436d518ec9eb1986dfef736fc8f3e9640dae17 + 0c98b3aa974a407bb6136e1cb3a1bcd35469c709 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e49d7d8cdac..a5f5e64d4441 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20305-04 + 16.7.0-preview-20305-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20305-04 + 16.7.0-preview-20305-05 $(MicrosoftBuildPackageVersion) From 2f25ad9fa8b60c4ab4674dad436bd553e95a3df4 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Thu, 28 May 2020 20:18:19 -0700 Subject: [PATCH 769/896] Add support for reading the extern alias (#11451) Add support for reading the aliases flag from the assets file. --- src/Tasks/Common/MetadataKeys.cs | 4 +- .../ResolvePackageAssets.cs | 11 +- ...nThatWeHaveAPackageReferenceWithAliases.cs | 249 ++++++++++++++++++ .../ProjectConstruction/TestProject.cs | 4 + .../TestPackageReference.cs | 5 +- 5 files changed, 268 insertions(+), 5 deletions(-) create mode 100644 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs diff --git a/src/Tasks/Common/MetadataKeys.cs b/src/Tasks/Common/MetadataKeys.cs index 71d66a3d8f69..5355f3f964d1 100644 --- a/src/Tasks/Common/MetadataKeys.cs +++ b/src/Tasks/Common/MetadataKeys.cs @@ -101,6 +101,8 @@ internal static class MetadataKeys public const string DestinationSubPath = "DestinationSubPath"; public const string AssetType = "AssetType"; - public const string ReferenceOnly = "ReferenceOnly"; + public const string ReferenceOnly = "ReferenceOnly"; + + public const string Aliases = "Aliases"; } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs index 830a94ac80ea..66210eb70217 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection.Metadata; using System.Security.Cryptography; using System.Text; using Microsoft.Build.Evaluation; @@ -869,7 +868,15 @@ private void WriteCompileTimeAssemblies() { WriteItems( _compileTimeTarget, - package => package.CompileTimeAssemblies); + package => package.CompileTimeAssemblies, + filter: null, + writeMetadata: (package, asset) => + { + if (asset.Properties.TryGetValue(LockFileItem.AliasesProperty, out var aliases)) + { + WriteMetadata(MetadataKeys.Aliases, aliases); + } + }); } private void WriteContentFilesToPreprocess() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs new file mode 100644 index 000000000000..697e95e59170 --- /dev/null +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs @@ -0,0 +1,249 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using FluentAssertions; +using Microsoft.NET.TestFramework; +using Microsoft.NET.TestFramework.Assertions; +using Microsoft.NET.TestFramework.Commands; +using Microsoft.NET.TestFramework.ProjectConstruction; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.NET.Build.Tests +{ + public class GivenThatWeHaveAPackageReferenceWithAliases : SdkTest + { + + public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base(log) + { } + + [RequiresMSBuildVersionFact("16.7.0")] + public void CanBuildProjectWithPackageReferencesWithConflictingTypes() + { + var targetFramework = "netcoreapp5.0"; + var packageReferences = GetPackageReferencesWithConflictingTypes(targetFramework, "A", "B"); + + TestProject testProject = new TestProject() + { + Name = "Project", + IsSdkProject = true, + IsExe = false, + TargetFrameworks = targetFramework, + }; + + testProject.PackageReferences.Add(packageReferences.First()); + testProject.PackageReferences.Add( + new TestPackageReference( + packageReferences.Last().ID, + packageReferences.Last().Version, + packageReferences.Last().NupkgPath, + packageReferences.Last().PrivateAssets, + aliases: "Special")); + var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath)); + + testProject.AdditionalProperties.Add("RestoreSources", + "$(RestoreSources);" + string.Join(";", packagesPaths)); + + // Use a test-specific packages folder + testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\..\pkg"; + testProject.SourceFiles[$"{testProject.Name}.cs"] = ConflictingClassLibUsage; + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + buildCommand.Execute() + .Should() + .Pass(); + } + + [RequiresMSBuildVersionFact("16.7.0")] + public void CanBuildProjectWithMultiplePackageReferencesWithAliases() + { + var targetFramework = "netcoreapp5.0"; + + var packageReferenceA = GetPackageReference(targetFramework, "A", ClassLibClassA); + var packageReferenceB = GetPackageReference(targetFramework, "B", ClassLibClassB); + + TestProject testProject = new TestProject() + { + Name = "Project", + IsSdkProject = true, + IsExe = false, + TargetFrameworks = targetFramework, + }; + + testProject.PackageReferences.Add( + new TestPackageReference( + packageReferenceA.ID, + packageReferenceA.Version, + packageReferenceA.NupkgPath, + packageReferenceA.PrivateAssets, + aliases: "First")); + testProject.PackageReferences.Add( + new TestPackageReference( + packageReferenceB.ID, + packageReferenceB.Version, + packageReferenceB.NupkgPath, + packageReferenceB.PrivateAssets, + aliases: "Second")); + + testProject.AdditionalProperties.Add("RestoreSources", + "$(RestoreSources);" + Path.GetDirectoryName(packageReferenceA.NupkgPath) + ";" + Path.GetDirectoryName(packageReferenceB.NupkgPath)); + + // Use a test-specific packages folder + testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\..\pkg"; + testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + buildCommand.Execute() + .Should() + .Pass(); + } + + [RequiresMSBuildVersionFact("16.7.0")] + public void CanBuildProjectWithAPackageReferenceWithMultipleAliases() + { + var targetFramework = "netcoreapp5.0"; + + var packageReferenceA = GetPackageReference(targetFramework, "A", ClassLibMultipleClasses); + + TestProject testProject = new TestProject() + { + Name = "Project", + IsSdkProject = true, + IsExe = false, + TargetFrameworks = targetFramework, + }; + + testProject.PackageReferences.Add( + new TestPackageReference( + packageReferenceA.ID, + packageReferenceA.Version, + packageReferenceA.NupkgPath, + packageReferenceA.PrivateAssets, + aliases: "First,Second")); + + testProject.AdditionalProperties.Add("RestoreSources", + "$(RestoreSources);" + Path.GetDirectoryName(packageReferenceA.NupkgPath)); + + // Use a test-specific packages folder + testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\..\pkg"; + testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + buildCommand.Execute() + .Should() + .Pass(); + } + + private IEnumerable GetPackageReferencesWithConflictingTypes(string targetFramework, params string[] packageNames) + { + foreach (var packageName in packageNames) + { + yield return GetPackageReference(targetFramework, packageName, ClassLibConflictingMethod); + } + } + + private TestPackageReference GetPackageReference(string targetFramework, string packageName, string projectFileContent) + { + var project = GetProject(targetFramework, packageName, projectFileContent); + var packCommand = new PackCommand(Log, _testAssetsManager.CreateTestProject(project).TestRoot, packageName); + + packCommand + .Execute() + .Should() + .Pass(); + return new TestPackageReference(packageName, "1.0.0", packCommand.GetNuGetPackage(packageName)); + } + + private static TestProject GetProject(string targetFramework, string referenceProjectName, string projectFileContent) + { + var project = new TestProject() + { + Name = referenceProjectName, + TargetFrameworks = targetFramework, + IsSdkProject = true + }; + project.SourceFiles[$"{referenceProjectName}.cs"] = projectFileContent; + return project; + } + + private static string ClassLibConflictingMethod = @" +using System; +public class ClassLib +{ + public void ConflictingMethod() + { + } +} +"; + + private static string ClassLibClassA = @" +using System; +public class A +{ + public void AMethod() + { + } +} +"; + + private static string ClassLibMultipleClasses = @" +using System; +public class A +{ + public void AMethod() + { + } +} + +public class B +{ + public void BMethod() + { + } +} +"; + + private static string ClassLibClassB = @" +using System; +public class B +{ + public void BMethod() + { + } +} +"; + + private static string ClassLibAandBUsage = @" +extern alias First; +extern alias Second; +using System; +public class ClassLibUsage +{ + public void UsageMethod() + { + new First.A().AMethod(); + new Second.B().BMethod(); + } +} +"; + + private static string ConflictingClassLibUsage = @" +extern alias Special; +using System; +public class ClassLibUsage +{ + public void UsageMethod() + { + new Special.ClassLib().ConflictingMethod(); + } +} +"; + } +} diff --git a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs index ea0e3a67f8a9..bb59bd78fb09 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs @@ -170,6 +170,10 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder, { packageReferenceElement.Add(new XAttribute("PrivateAssets", packageReference.PrivateAssets)); } + if (packageReference.Aliases != null) + { + packageReferenceElement.Add(new XAttribute("Aliases", packageReference.Aliases)); + } packageReferenceItemGroup.Add(packageReferenceElement); } diff --git a/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs b/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs index cb5ee4997b89..3a046ad96f98 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestPackageReference.cs @@ -11,19 +11,20 @@ namespace Microsoft.NET.TestFramework { public class TestPackageReference { - public TestPackageReference(string id, string version = null, string nupkgPath = null, string privateAssets = null) + public TestPackageReference(string id, string version = null, string nupkgPath = null, string privateAssets = null, string aliases = null) { ID = id; Version = version; NupkgPath = nupkgPath; PrivateAssets = privateAssets; + Aliases = aliases; } public string ID { get; private set; } public string Version { get; private set; } public string NupkgPath { get; private set; } public string PrivateAssets { get; private set; } - + public string Aliases { get; private set; } public bool NuGetPackageExists() { return File.Exists(Path.Combine(this.NupkgPath, String.Concat(this.ID + "." + this.Version + ".nupkg"))); From 7ccff2bd7d149680ed324f021117e18f6457eb91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 18:58:24 +0000 Subject: [PATCH 770/896] Update dependencies from https://github.com/microsoft/msbuild build 20200608.1 (#4601) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20305-05 -> To Version 16.7.0-preview-20308-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e8a1b514478..e5b77bb01ba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 0c98b3aa974a407bb6136e1cb3a1bcd35469c709 + 584ca5f11b28971f5651b4b8de5f173ad1cb2786 - + https://github.com/microsoft/msbuild - 0c98b3aa974a407bb6136e1cb3a1bcd35469c709 + 584ca5f11b28971f5651b4b8de5f173ad1cb2786 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a5f5e64d4441..21141b5b32fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20305-05 + 16.7.0-preview-20308-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20305-05 + 16.7.0-preview-20308-01 $(MicrosoftBuildPackageVersion) From 7366e16a0b5d87b0e5789c85b9846c6147766dc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 21:44:22 +0000 Subject: [PATCH 771/896] Update dependencies from https://github.com/dotnet/fsharp build 20200608.2 (#4602) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20304.1 -> To Version 10.10.0-beta.20308.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5b77bb01ba7..aaec143d5589 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 584ca5f11b28971f5651b4b8de5f173ad1cb2786 - + https://github.com/dotnet/fsharp - 7673d5e78eca5bccb77a7e4561c9d9429bdc5f35 + f8fbef6d7c002d17be0a5fe38afff25bb4b7769c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 21141b5b32fa..a5003cea8fbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20304.1 + 10.10.0-beta.20308.2 From d72fa1b36a191a16eba49b9013c60d4ded7f25da Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Mon, 8 Jun 2020 19:54:30 -0700 Subject: [PATCH 772/896] use core msbuild only fact --- .../GivenThatWeHaveAPackageReferenceWithAliases.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs index 697e95e59170..ea4a511b7b31 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs @@ -21,7 +21,7 @@ public class GivenThatWeHaveAPackageReferenceWithAliases : SdkTest public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionFact("16.7.0")] + [CoreMSBuildOnlyFact] public void CanBuildProjectWithPackageReferencesWithConflictingTypes() { var targetFramework = "netcoreapp5.0"; @@ -59,7 +59,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes() .Pass(); } - [RequiresMSBuildVersionFact("16.7.0")] + [CoreMSBuildOnlyFact] public void CanBuildProjectWithMultiplePackageReferencesWithAliases() { var targetFramework = "netcoreapp5.0"; @@ -104,7 +104,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases() .Pass(); } - [RequiresMSBuildVersionFact("16.7.0")] + [CoreMSBuildOnlyFact] public void CanBuildProjectWithAPackageReferenceWithMultipleAliases() { var targetFramework = "netcoreapp5.0"; From fd1c2fa6dfded3a3a308c7e439ba410352fe1ec3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 06:19:54 +0000 Subject: [PATCH 773/896] [release/3.1.4xx] Update dependencies from microsoft/vstest (#4600) * Update dependencies from https://github.com/microsoft/vstest build 20200608-10 Microsoft.NET.Test.Sdk From Version 16.6.0 -> To Version 16.7.0-preview-20200608-10 * Update dependencies from https://github.com/microsoft/vstest build 20200608-11 Microsoft.NET.Test.Sdk From Version 16.6.0 -> To Version 16.7.0-release-20200608-11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aaec143d5589..88f929677f10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/NuGet/NuGet.Client 721908c643a7806b630774e76b53e37507fec062 - + https://github.com/microsoft/vstest - d10bcbb28cc3999bcc12758a41a04b998eb9595b + 501939e9fa61f0c65fb466d6367f6d5000b86fec https://github.com/aspnet/websdk diff --git a/eng/Versions.props b/eng/Versions.props index a5003cea8fbe..0217345339ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 16.6.0 + 16.7.0-release-20200608-11 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 66b71ef8df7a4cc6cc2e39cab10d02930e3fee25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 15:46:32 +0000 Subject: [PATCH 774/896] Update dependencies from https://github.com/microsoft/msbuild build 20200609.1 (#4603) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20308-01 -> To Version 16.7.0-preview-20309-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88f929677f10..b2e62eb78ef0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 584ca5f11b28971f5651b4b8de5f173ad1cb2786 + 90e6db99fe58819a6f29df78978dcc93fc274f55 - + https://github.com/microsoft/msbuild - 584ca5f11b28971f5651b4b8de5f173ad1cb2786 + 90e6db99fe58819a6f29df78978dcc93fc274f55 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0217345339ce..2380c482d8da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20308-01 + 16.7.0-preview-20309-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20308-01 + 16.7.0-preview-20309-01 $(MicrosoftBuildPackageVersion) From a926911d193f5ed70aaa0b12fa591b00fc5e638a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 20:49:26 +0000 Subject: [PATCH 775/896] Update dependencies from https://github.com/microsoft/msbuild build 20200609.2 (#4605) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20309-01 -> To Version 16.7.0-preview-20309-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2e62eb78ef0..9a58c45fa1c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 90e6db99fe58819a6f29df78978dcc93fc274f55 + d6862eb21695a0ecbd1aa1362eb67ba3e1985c87 - + https://github.com/microsoft/msbuild - 90e6db99fe58819a6f29df78978dcc93fc274f55 + d6862eb21695a0ecbd1aa1362eb67ba3e1985c87 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2380c482d8da..c04c9a746a94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20309-01 + 16.7.0-preview-20309-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20309-01 + 16.7.0-preview-20309-02 $(MicrosoftBuildPackageVersion) From 81b91dddf9e3b65d3ef93c61a48f228be7bc1aa6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 16:55:24 +0000 Subject: [PATCH 776/896] Update dependencies from https://github.com/microsoft/msbuild build 20200610.2 (#4606) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20309-02 -> To Version 16.7.0-preview-20310-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a58c45fa1c6..3d3e304b9026 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - d6862eb21695a0ecbd1aa1362eb67ba3e1985c87 + 5292fedb9b70555083002a102309f3c42752f29f - + https://github.com/microsoft/msbuild - d6862eb21695a0ecbd1aa1362eb67ba3e1985c87 + 5292fedb9b70555083002a102309f3c42752f29f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c04c9a746a94..f91dc126ae99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20309-02 + 16.7.0-preview-20310-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20309-02 + 16.7.0-preview-20310-02 $(MicrosoftBuildPackageVersion) From 14d930666bee1a9ba3ccf19a6ffeb594a108b51d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jun 2020 16:56:47 +0000 Subject: [PATCH 777/896] Update dependencies from https://github.com/microsoft/msbuild build 20200610.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-02 -> To Version 16.7.0-preview-20310-05 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d3e304b9026..54659547462a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 5292fedb9b70555083002a102309f3c42752f29f + 3c69de3e7b5f5c94313be0060a6eae658c1774bf - + https://github.com/microsoft/msbuild - 5292fedb9b70555083002a102309f3c42752f29f + 3c69de3e7b5f5c94313be0060a6eae658c1774bf https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f91dc126ae99..4ff92dac68d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20310-02 + 16.7.0-preview-20310-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-02 + 16.7.0-preview-20310-05 $(MicrosoftBuildPackageVersion) From fe6558722b808c360b6618bdf926eeab5dd5599b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jun 2020 16:56:54 +0000 Subject: [PATCH 778/896] Update dependencies from https://github.com/microsoft/msbuild build 20200610.3 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-05 -> To Version 16.7.0-preview-20310-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54659547462a..8ae8519e715b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 3c69de3e7b5f5c94313be0060a6eae658c1774bf + 51e8dd25010de68b07047ac49254e29d2af41241 - + https://github.com/microsoft/msbuild - 3c69de3e7b5f5c94313be0060a6eae658c1774bf + 51e8dd25010de68b07047ac49254e29d2af41241 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4ff92dac68d6..c2d4d38686e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20310-05 + 16.7.0-preview-20310-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-05 + 16.7.0-preview-20310-03 $(MicrosoftBuildPackageVersion) From 03e7f6316b9e3dc251de760183f483c6795477e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jun 2020 16:57:01 +0000 Subject: [PATCH 779/896] Update dependencies from https://github.com/microsoft/msbuild build 20200610.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-03 -> To Version 16.7.0-preview-20310-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ae8519e715b..1e2c1a9dc64b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 51e8dd25010de68b07047ac49254e29d2af41241 + 4b437b2406d46ecc634a0b2c2ebc62254b0121f2 - + https://github.com/microsoft/msbuild - 51e8dd25010de68b07047ac49254e29d2af41241 + 4b437b2406d46ecc634a0b2c2ebc62254b0121f2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c2d4d38686e9..69b2098af62f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20310-03 + 16.7.0-preview-20310-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-03 + 16.7.0-preview-20310-04 $(MicrosoftBuildPackageVersion) From c5395c2c266711e423d92a932c2393004472994b Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 10 Jun 2020 11:03:12 -0700 Subject: [PATCH 780/896] Update GivenThatWeHaveAPackageReferenceWithAliases.cs --- .../GivenThatWeHaveAPackageReferenceWithAliases.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs index ea4a511b7b31..a9308086dfec 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs @@ -24,7 +24,7 @@ public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base [CoreMSBuildOnlyFact] public void CanBuildProjectWithPackageReferencesWithConflictingTypes() { - var targetFramework = "netcoreapp5.0"; + var targetFramework = "netcoreapp3.1"; var packageReferences = GetPackageReferencesWithConflictingTypes(targetFramework, "A", "B"); TestProject testProject = new TestProject() @@ -62,7 +62,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes() [CoreMSBuildOnlyFact] public void CanBuildProjectWithMultiplePackageReferencesWithAliases() { - var targetFramework = "netcoreapp5.0"; + var targetFramework = "netcoreapp3.1"; var packageReferenceA = GetPackageReference(targetFramework, "A", ClassLibClassA); var packageReferenceB = GetPackageReference(targetFramework, "B", ClassLibClassB); @@ -107,7 +107,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases() [CoreMSBuildOnlyFact] public void CanBuildProjectWithAPackageReferenceWithMultipleAliases() { - var targetFramework = "netcoreapp5.0"; + var targetFramework = "netcoreapp3.1"; var packageReferenceA = GetPackageReference(targetFramework, "A", ClassLibMultipleClasses); From adef720e8ce6fa6d39c2ec024cb23f9bdba04b24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 19:57:37 +0000 Subject: [PATCH 781/896] Update dependencies from https://github.com/dotnet/fsharp build 20200610.3 (#4608) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20308.2 -> To Version 10.10.0-beta.20310.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d3e304b9026..5c3cf5dc2186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,7 +25,7 @@ https://github.com/microsoft/msbuild 5292fedb9b70555083002a102309f3c42752f29f - + https://github.com/dotnet/fsharp f8fbef6d7c002d17be0a5fe38afff25bb4b7769c diff --git a/eng/Versions.props b/eng/Versions.props index f91dc126ae99..f1e61bacdb73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20308.2 + 10.10.0-beta.20310.3 From 731868b95aad688fafaec3ae1f972711f87c27f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jun 2020 20:59:22 +0000 Subject: [PATCH 782/896] Update dependencies from https://github.com/microsoft/msbuild build 20200610.7 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-02 -> To Version 16.7.0-preview-20310-07 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e2c1a9dc64b..2257b3a8a921 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 112cd1f6e31b506668ab15f816110290643fa91c - + https://github.com/microsoft/msbuild - 4b437b2406d46ecc634a0b2c2ebc62254b0121f2 + ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/microsoft/msbuild - 4b437b2406d46ecc634a0b2c2ebc62254b0121f2 + ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 69b2098af62f..7db2534d44b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20310-04 + 16.7.0-preview-20310-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-04 + 16.7.0-preview-20310-07 $(MicrosoftBuildPackageVersion) From 33618c6dec5d556403033825f61c1b474418e055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 06:45:52 +0000 Subject: [PATCH 783/896] Update dependencies from https://github.com/dotnet/roslyn build 20200610.5 (#4609) Microsoft.Net.Compilers.Toolset From Version 3.7.0-1.20262.2 -> To Version 3.7.0-3.20310.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5218ddfe23ab..59468c2c03d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp f8fbef6d7c002d17be0a5fe38afff25bb4b7769c - + https://github.com/dotnet/roslyn - d6aa790a2051d9c0bd99ba9f7c6ea5be1568173c + 9083edf60271f915cf0c69c194afd9e0c6266f5c https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 5c7a5603542d..2e67fffb4e25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-1.20262.2 + 3.7.0-3.20310.5 From 89e2d2901f4da8ff43d5f83375a20c34afc20021 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 07:07:46 +0000 Subject: [PATCH 784/896] Update dependencies from https://github.com/dotnet/fsharp build 20200610.5 (#4610) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20310.3 -> To Version 10.10.0-beta.20310.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59468c2c03d4..0dd36413b50c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - f8fbef6d7c002d17be0a5fe38afff25bb4b7769c + 3c3ccaf45f2c30cc89e593aeb3c1d2274ab62c6c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2e67fffb4e25..bdecf728c1c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20310.3 + 10.10.0-beta.20310.5 From 09cb09c2fd9a785160c96905fcb70e5321a42d46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 07:40:20 +0000 Subject: [PATCH 785/896] Update dependencies from https://github.com/dotnet/roslyn build 20200611.5 (#4613) Microsoft.Net.Compilers.Toolset From Version 3.7.0-3.20310.5 -> To Version 3.7.0-3.20311.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dd36413b50c..4487cb09ff90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 3c3ccaf45f2c30cc89e593aeb3c1d2274ab62c6c - + https://github.com/dotnet/roslyn - 9083edf60271f915cf0c69c194afd9e0c6266f5c + b9a1d7405e21f71d280fdef8b63ddd2276d5a7b7 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index bdecf728c1c3..288879822a89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-3.20310.5 + 3.7.0-3.20311.5 From 6f444ccb1eca9e10c3dd258f29510ecaf0305fe4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 05:42:11 +0000 Subject: [PATCH 786/896] Update dependencies from https://github.com/dotnet/roslyn build 20200612.2 (#4615) Microsoft.Net.Compilers.Toolset From Version 3.7.0-3.20311.5 -> To Version 3.7.0-3.20312.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4487cb09ff90..299ac816028b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 3c3ccaf45f2c30cc89e593aeb3c1d2274ab62c6c - + https://github.com/dotnet/roslyn - b9a1d7405e21f71d280fdef8b63ddd2276d5a7b7 + 7869637badb48af19156cd9d1f8d3ba69663aa1d https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 288879822a89..1125aedd3ddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-3.20311.5 + 3.7.0-3.20312.2 From aabf6526c47f1c70c688e7b1d2b6275c648768da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 09:42:31 +0000 Subject: [PATCH 787/896] Update dependencies from https://github.com/microsoft/vstest build 20200612-02 (#4616) Microsoft.NET.Test.Sdk From Version 16.7.0-release-20200608-11 -> To Version 16.7.0-release-20200612-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 299ac816028b..235e9a5af835 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/NuGet/NuGet.Client 721908c643a7806b630774e76b53e37507fec062 - + https://github.com/microsoft/vstest - 501939e9fa61f0c65fb466d6367f6d5000b86fec + df62aca07cacc5c018dc8e828f03a0cd79ee52da https://github.com/aspnet/websdk diff --git a/eng/Versions.props b/eng/Versions.props index 1125aedd3ddf..bc5e4f6e7cc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 16.7.0-release-20200608-11 + 16.7.0-release-20200612-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 871ac9f90ed27cc5229b39130bfe2a73b433bd0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 09:44:34 +0000 Subject: [PATCH 788/896] Update dependencies from https://github.com/dotnet/fsharp build 20200612.2 (#4617) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20310.5 -> To Version 10.10.0-beta.20312.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 235e9a5af835..8899ba731b10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - 3c3ccaf45f2c30cc89e593aeb3c1d2274ab62c6c + d7c00c9c988faa8f48980e6b54dd4a320adb8384 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bc5e4f6e7cc8..fe4600ed2b06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20310.5 + 10.10.0-beta.20312.2 From 0be2ac0ea96182ae970421a05cd01655a51c41a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 13:02:42 +0000 Subject: [PATCH 789/896] Update dependencies from https://github.com/dotnet/roslyn build 20200612.3 (#4618) Microsoft.Net.Compilers.Toolset From Version 3.7.0-3.20312.2 -> To Version 3.7.0-3.20312.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8899ba731b10..010d30dc8939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp d7c00c9c988faa8f48980e6b54dd4a320adb8384 - + https://github.com/dotnet/roslyn - 7869637badb48af19156cd9d1f8d3ba69663aa1d + ec4841263590f5456e32728d98097e97c1605e22 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index fe4600ed2b06..c204b549ebba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-3.20312.2 + 3.7.0-3.20312.3 From d46fa3c0dedf10530d8e8946deb10beab4b5943d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jun 2020 18:12:25 +0000 Subject: [PATCH 790/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6645 NuGet.Build.Tasks From Version 5.7.0-preview.2.6618 -> To Version 5.7.0-preview.3.6645 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7a9a9347b41..e3c9cbf75d15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 721908c643a7806b630774e76b53e37507fec062 + f548641f11f1a7a0bc27632e9534f1bb1e43a350 diff --git a/eng/Versions.props b/eng/Versions.props index 27cc116c308d..5776c70630fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-preview.2.6618 + 5.7.0-preview.3.6645 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From 1cf3a0a9be5521028b803845fce17e34a6978d5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 18:22:56 +0000 Subject: [PATCH 791/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6645 (#4619) NuGet.Build.Tasks From Version 5.7.0-preview.2.6618 -> To Version 5.7.0-preview.3.6645 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 010d30dc8939..cc205ccf4ea5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 721908c643a7806b630774e76b53e37507fec062 + f548641f11f1a7a0bc27632e9534f1bb1e43a350 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index c204b549ebba..9eabe9c2ad2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-preview.2.6618 + 5.7.0-preview.3.6645 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 369bb084c88d357f4916a4b7b8e03b4e60cf538b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 18:26:19 +0000 Subject: [PATCH 792/896] Update dependencies from https://github.com/dotnet/sdk build 20200612.12 (#4620) Microsoft.NET.Sdk From Version 3.1.400-preview.20271.7 -> To Version 3.1.400-preview.20312.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc205ccf4ea5..dfd551aa87f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli df651f8b833448cfe57cad49e1a36d91631d5d2f - + https://github.com/dotnet/sdk - 112cd1f6e31b506668ab15f816110290643fa91c + 32e8cf29db2e5b3052a70e9b1926fc740aec7ab1 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9eabe9c2ad2d..34c6559c4134 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20271.7 + 3.1.400-preview.20312.12 From 4f928251590e3e352e3b6ce13ac2180ae4b2a84d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 19:26:54 +0000 Subject: [PATCH 793/896] Update dependencies from https://github.com/dotnet/sdk build 20200612.12 (#13398) Microsoft.NET.Sdk From Version 3.1.400-preview.20271.7 -> To Version 3.1.400-preview.20312.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 651c7dcfd442..e9450965c259 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 112cd1f6e31b506668ab15f816110290643fa91c + 32e8cf29db2e5b3052a70e9b1926fc740aec7ab1 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 1fbe5bee4fd1..1f646ff74fbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20271.7 + 3.1.400-preview.20312.12 $(MicrosoftNETSdkPackageVersion) From fa55d7acf73d02c2b81e7ea5e2220a18718ea0a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 20:31:54 +0000 Subject: [PATCH 794/896] Update dependencies from https://github.com/dotnet/cli build 20200612.12 (#4621) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20301.1 -> To Version 3.1.400-preview.20312.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfd551aa87f5..0535cc9cde43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - df651f8b833448cfe57cad49e1a36d91631d5d2f + 4f928251590e3e352e3b6ce13ac2180ae4b2a84d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 34c6559c4134..82d56c82de00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20301.1 + 3.1.400-preview.20312.12 From 7620618f053b3fd45d7546becad19b0b52ccf903 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Jun 2020 14:33:22 -0700 Subject: [PATCH 795/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 653d157e7a91..c63f7c2e6228 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015147", + "dotnet": "3.1.400-preview-015174", "vs-opt": { "version": "15.9" } From 4ccc41624282a449f1f83d80edc3d7dc2597df6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jun 2020 18:16:01 +0000 Subject: [PATCH 796/896] Update dependencies from https://github.com/dotnet/fsharp build 20200612.5 (#4622) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20312.2 -> To Version 10.10.0-beta.20312.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0535cc9cde43..d2b1604b8a23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - d7c00c9c988faa8f48980e6b54dd4a320adb8384 + 2aa38744c9288aa9ca2bc192c1c85cdb1d1d53a0 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 82d56c82de00..abeba6b8a67f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20312.2 + 10.10.0-beta.20312.5 From 17bf6584694edcae6828bb69a422aefacc62527c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2020 05:56:19 +0000 Subject: [PATCH 797/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#13397) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6645 NuGet.Build.Tasks From Version 5.7.0-preview.2.6618 -> To Version 5.7.0-preview.3.6645 * update stage 0 * Update stage 0 to 3.1.400-preview-015177 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9450965c259..8dfecff7757b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 721908c643a7806b630774e76b53e37507fec062 + f548641f11f1a7a0bc27632e9534f1bb1e43a350 diff --git a/eng/Versions.props b/eng/Versions.props index 1f646ff74fbc..f0878b49dde1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview-015138 + 3.1.400-preview-015177 @@ -57,7 +57,7 @@ - 5.7.0-preview.2.6618 + 5.7.0-preview.3.6645 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/global.json b/global.json index 31c369ee1b08..d6e411e10ffb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015138", + "dotnet": "3.1.400-preview-015177", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From da9a1fbcd1fdfe96032559e86368cb5ea3fb59eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2020 06:54:21 +0000 Subject: [PATCH 798/896] Update dependencies from https://github.com/dotnet/cli build 20200613.5 (#4623) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20312.12 -> To Version 3.1.400-preview.20313.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b1604b8a23..26898bf73713 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 4f928251590e3e352e3b6ce13ac2180ae4b2a84d + 17bf6584694edcae6828bb69a422aefacc62527c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index abeba6b8a67f..843d58f5f5ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20312.12 + 3.1.400-preview.20313.5 From 4e37ad2f6b369c1ecd1509a6790fb899856622bd Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Mon, 15 Jun 2020 13:59:37 +1000 Subject: [PATCH 799/896] Include diagnostic level metadata on ResolvedPackageReference This information is needed by the Project System to correctly indicate when a package in the tree has an associated warning or error state. --- src/Tasks/Common/MetadataKeys.cs | 1 + .../GivenAResolvePackageDependenciesTask.cs | 34 +++++++++++++++++++ ...WantToGetDependenciesViaDesignTimeBuild.cs | 4 ++- ...PreprocessPackageDependenciesDesignTime.cs | 3 ++ .../ResolvePackageDependencies.cs | 14 ++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Common/MetadataKeys.cs b/src/Tasks/Common/MetadataKeys.cs index 71d66a3d8f69..57d9c84677a5 100644 --- a/src/Tasks/Common/MetadataKeys.cs +++ b/src/Tasks/Common/MetadataKeys.cs @@ -18,6 +18,7 @@ internal static class MetadataKeys public const string IsTopLevelDependency = "IsTopLevelDependency"; public const string AllowExplicitVersion = "AllowExplicitVersion"; public const string RelativePath = "RelativePath"; + public const string DiagnosticLevel = "DiagnosticLevel"; // Target Metadata public const string RuntimeIdentifier = "RuntimeIdentifier"; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs index e972844b2b52..f2d5fb38fe21 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using NuGet.Common; using Xunit; using static Microsoft.NET.Build.Tasks.UnitTests.LockFileSnippets; @@ -162,6 +163,39 @@ public void ItAssignsExpectedTopLevelDependencies() }); } + [Fact] + public void ItAssignsDiagnosticLevel() + { + string lockFileContent = CreateLockFileSnippet( + targets: new string[] { + CreateTarget(".NETCoreApp,Version=v1.0", TargetLibA, TargetLibB, TargetLibC), + CreateTarget(".NETCoreApp,Version=v1.0/osx.10.11-x64", TargetLibA, TargetLibB, TargetLibC), + }, + libraries: new string[] { LibADefn, LibBDefn, LibCDefn }, + projectFileDependencyGroups: new string[] { NETCoreGroup, NETCoreOsxGroup }, + logs: new[] + { + // LibA + CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibA"), + CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibA"), + CreateLog(NuGetLogCode.NU1000, LogLevel.Error, "", libraryId: "LibA"), + // LibB + CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB"), + CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibB") + } + ); + + var task = GetExecutedTaskFromContents(lockFileContent, out _); + + var defs = task.PackageDefinitions.ToLookup(def => def.ItemSpec); + + defs.Count().Should().Be(3); + + defs["LibA/1.2.3"].Single().GetMetadata(MetadataKeys.DiagnosticLevel).Should().Be("Error"); + defs["LibB/1.2.3"].Single().GetMetadata(MetadataKeys.DiagnosticLevel).Should().Be("Warning"); + defs["LibC/1.2.3"].Single().GetMetadata(MetadataKeys.DiagnosticLevel).Should().BeEmpty(); + } + [Fact] public void ItAssignsExpectedTopLevelDependenciesFromAllTargets() { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs index a3140e0531fc..c454cf4a50b4 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs @@ -77,7 +77,8 @@ public void ItShouldReturnUnresolvedPackageDependenciesWithTypePackage() { MetadataKeys.Version, "1.0.0" }, { MetadataKeys.Path, "some path" }, { MetadataKeys.ResolvedPath, "" }, - { MetadataKeys.Type, "Unresolved" } + { MetadataKeys.Type, "Unresolved" }, + { MetadataKeys.DiagnosticLevel, "Warning" } }) }, PackageDependencies = new ITaskItem[] @@ -100,6 +101,7 @@ public void ItShouldReturnUnresolvedPackageDependenciesWithTypePackage() Assert.Equal("1.0.0", item.GetMetadata(MetadataKeys.Version)); Assert.Equal("some path", item.GetMetadata(MetadataKeys.Path)); Assert.Equal("", item.GetMetadata(MetadataKeys.ResolvedPath)); + Assert.Equal("Warning", item.GetMetadata(MetadataKeys.DiagnosticLevel)); Assert.False(item.GetBooleanMetadata(MetadataKeys.IsImplicitlyDefined)); Assert.False(item.GetBooleanMetadata(PreprocessPackageDependenciesDesignTime.ResolvedMetadata)); } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index 5e9fe997a33b..bacde6eb4335 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -32,6 +32,7 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase /// - ResolvedPath = "C:\Users\drnoakes\.nuget\packages\metadataextractor\1.0.0" /// - Type = "package" /// - Version = "2.3.0" + /// - DiagnosticLevel = "" /// [Required] public ITaskItem[] PackageDefinitions { get; set; } @@ -122,12 +123,14 @@ protected override void ExecuteCore() ? resolvedPath : packageDef.GetMetadata(MetadataKeys.Path)) ?? string.Empty; var isImplicitlyDefined = implicitPackageReferences.Contains(name); + var diagnosticLevel = packageDef.GetMetadata(MetadataKeys.DiagnosticLevel) ?? string.Empty; var outputItem = new TaskItem(packageDef.ItemSpec); outputItem.SetMetadata(MetadataKeys.Name, name); outputItem.SetMetadata(MetadataKeys.Version, version); outputItem.SetMetadata(MetadataKeys.Path, path); outputItem.SetMetadata(MetadataKeys.IsImplicitlyDefined, isImplicitlyDefined.ToString()); + outputItem.SetMetadata(MetadataKeys.DiagnosticLevel, diagnosticLevel); outputItem.SetMetadata(ResolvedMetadata, resolved.ToString()); outputItems.Add(outputItem); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index 0eea24fceb40..e9dfd371ae41 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -173,6 +173,8 @@ private void GetPackageAndFileDefinitions() string resolvedPackagePath = ResolvePackagePath(package); item.SetMetadata(MetadataKeys.ResolvedPath, resolvedPackagePath ?? string.Empty); + item.SetMetadata(MetadataKeys.DiagnosticLevel, GetPackageDiagnosticLevel(package)); + _packageDefinitions.Add(item); if (!EmitLegacyAssetsFileItems) @@ -227,6 +229,18 @@ private void GetPackageAndFileDefinitions() _fileDefinitions.Add(fileItem); } } + + string GetPackageDiagnosticLevel(LockFileLibrary package) + { + var messages = LockFile.LogMessages.Where(log => log.LibraryId == package.Name); + + if (!messages.Any()) + { + return string.Empty; + } + + return messages.Max(log => log.Level).ToString(); + } } // get target definitions and package and file dependencies From 6f5f5c116994d19cde36392533b9e7cdf62df4e0 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 16 Jun 2020 22:22:47 +1000 Subject: [PATCH 800/896] Consider target when joining diagnostic to package reference --- .../GivenAResolvePackageDependenciesTask.cs | 31 ++++++++++++------- .../ResolvePackageDependencies.cs | 6 +++- ...rosoft.PackageDependencyResolution.targets | 1 + 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs index f2d5fb38fe21..b94610630980 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs @@ -166,6 +166,9 @@ public void ItAssignsExpectedTopLevelDependencies() [Fact] public void ItAssignsDiagnosticLevel() { + const string target1 = ".NETCoreApp,Version=v1.0"; + const string target2 = ".NETCoreApp,Version=v2.0"; + string lockFileContent = CreateLockFileSnippet( targets: new string[] { CreateTarget(".NETCoreApp,Version=v1.0", TargetLibA, TargetLibB, TargetLibC), @@ -176,16 +179,19 @@ public void ItAssignsDiagnosticLevel() logs: new[] { // LibA - CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibA"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibA"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Error, "", libraryId: "LibA"), + CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibA", targetGraphs: new[] { target1 }), + CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibA", targetGraphs: new[] { target1 }), + CreateLog(NuGetLogCode.NU1000, LogLevel.Error, "", libraryId: "LibA", targetGraphs: new[] { target1 }), // LibB - CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB"), - CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibB") + CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { target1, target2 }), + CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibB", targetGraphs: new[] { target1, target2 }), + // LibC (wrong target) + CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { target2 }), + CreateLog(NuGetLogCode.NU1000, LogLevel.Warning, "", libraryId: "LibB", targetGraphs: new[] { target2 }) } ); - var task = GetExecutedTaskFromContents(lockFileContent, out _); + var task = GetExecutedTaskFromContents(lockFileContent, out _, target: target1); var defs = task.PackageDefinitions.ToLookup(def => def.ItemSpec); @@ -822,19 +828,19 @@ public void ItMarksTransitiveProjectReferences() others.Where(t => t.ItemSpec == "ProjF/1.0.0").Count().Should().Be(1); } - private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, bool emitLegacyAssetsFileItems = true) + private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null) { lockFile = TestLockFiles.GetLockFile(lockFilePrefix); - return GetExecutedTask(lockFile, emitLegacyAssetsFileItems); + return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target); } - private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, bool emitLegacyAssetsFileItems = true) + private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null) { lockFile = TestLockFiles.CreateLockFile(lockFileContents); - return GetExecutedTask(lockFile, emitLegacyAssetsFileItems); + return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target); } - private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, bool emitLegacyAssetsFileItems) + private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, bool emitLegacyAssetsFileItems, string target) { var resolver = new MockPackageResolver(_packageRoot); @@ -843,7 +849,8 @@ private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, boo ProjectAssetsFile = lockFile.Path, ProjectPath = _projectPath, ProjectLanguage = null, - EmitLegacyAssetsFileItems = emitLegacyAssetsFileItems + EmitLegacyAssetsFileItems = emitLegacyAssetsFileItems, + TargetFrameworkMoniker = target }; task.Execute().Should().BeTrue(); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index e9dfd371ae41..9d70feee2e48 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -119,6 +119,8 @@ public string ProjectLanguage /// public bool EmitLegacyAssetsFileItems { get; set; } = false; + public string TargetFrameworkMoniker { get; set; } + #endregion public ResolvePackageDependencies() @@ -232,7 +234,9 @@ private void GetPackageAndFileDefinitions() string GetPackageDiagnosticLevel(LockFileLibrary package) { - var messages = LockFile.LogMessages.Where(log => log.LibraryId == package.Name); + string target = TargetFrameworkMoniker ?? ""; + + var messages = LockFile.LogMessages.Where(log => log.LibraryId == package.Name && log.TargetGraphs.Contains(target)); if (!messages.Any()) { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index 98e5ed94f261..808824e20bb0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -188,6 +188,7 @@ Copyright (c) .NET Foundation. All rights reserved. ProjectAssetsFile="$(ProjectAssetsFile)" ProjectLanguage="$(Language)" EmitLegacyAssetsFileItems="$(EmitLegacyAssetsFileItems)" + TargetFrameworkMoniker="$(NuGetTargetMoniker)" ContinueOnError="ErrorAndContinue"> From 9aae857d809d5a8354d9cce99e5009b886bf9f5a Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 17 Jun 2020 02:56:13 -0700 Subject: [PATCH 801/896] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index c63f7c2e6228..c1d1a30fa92e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015174", + "dotnet": "3.1.400-preview-015178", "vs-opt": { "version": "15.9" } From 8e288ea1ed0c66b8d206b2e44fb0e38c5760345a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jun 2020 12:07:11 +0000 Subject: [PATCH 802/896] Update dependencies from https://github.com/dotnet/sdk build 20200617.1 (#4624) Microsoft.NET.Sdk From Version 3.1.400-preview.20312.12 -> To Version 3.1.400-preview.20317.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26898bf73713..3ef62d26c731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 17bf6584694edcae6828bb69a422aefacc62527c - + https://github.com/dotnet/sdk - 32e8cf29db2e5b3052a70e9b1926fc740aec7ab1 + d554b5edcf3c45f5aa99d7194bb425b06167063f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 843d58f5f5ff..4c0a6838ce1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20312.12 + 3.1.400-preview.20317.1 From 55553541588a32b67ae80ea1a59d0848ef4a7843 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jun 2020 23:50:57 +0000 Subject: [PATCH 803/896] Update dependencies from https://github.com/dotnet/sdk build 20200617.6 (#4625) Microsoft.NET.Sdk From Version 3.1.400-preview.20317.1 -> To Version 3.1.400-preview.20317.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ef62d26c731..526021d3770b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 17bf6584694edcae6828bb69a422aefacc62527c - + https://github.com/dotnet/sdk - d554b5edcf3c45f5aa99d7194bb425b06167063f + 7594743c4ebaf05b5db3d91db374ed2db5374a59 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4c0a6838ce1f..5ebc5326a68e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20317.1 + 3.1.400-preview.20317.6 From fa53ed073a07b725af461f267f6139d2ee3c0677 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 02:34:51 +0000 Subject: [PATCH 804/896] [release/3.1.4xx] Update dependencies from dotnet/sdk (#13399) * Update dependencies from https://github.com/dotnet/sdk build 20200617.1 Microsoft.NET.Sdk From Version 3.1.400-preview.20312.12 -> To Version 3.1.400-preview.20317.1 * Update dependencies from https://github.com/dotnet/sdk build 20200617.6 Microsoft.NET.Sdk From Version 3.1.400-preview.20312.12 -> To Version 3.1.400-preview.20317.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dfecff7757b..3ac111230247 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 32e8cf29db2e5b3052a70e9b1926fc740aec7ab1 + 7594743c4ebaf05b5db3d91db374ed2db5374a59 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index f0878b49dde1..0e6d397b7ded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20312.12 + 3.1.400-preview.20317.6 $(MicrosoftNETSdkPackageVersion) From cfa8e702141af4db2e21680cbd21690a2866d923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 03:42:36 +0000 Subject: [PATCH 805/896] Update dependencies from https://github.com/dotnet/cli build 20200617.14 (#4626) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20313.5 -> To Version 3.1.400-preview.20317.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 526021d3770b..455a8a25f7a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 17bf6584694edcae6828bb69a422aefacc62527c + fa53ed073a07b725af461f267f6139d2ee3c0677 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5ebc5326a68e..50dd544116bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20313.5 + 3.1.400-preview.20317.14 From da8e818bae63428cfd3eec811c75d2e5d03a4272 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 12:45:25 +0000 Subject: [PATCH 806/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6653 (#4627) NuGet.Build.Tasks From Version 5.7.0-preview.3.6645 -> To Version 5.7.0-preview.3.6653 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 455a8a25f7a0..60a82d6323d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - f548641f11f1a7a0bc27632e9534f1bb1e43a350 + 728c0ad55c093fb374a1858d9cde5dc94b80c244 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 50dd544116bd..85b7eb809ca9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-preview.3.6645 + 5.7.0-preview.3.6653 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 8e5afefea0dda841cb43f80f379175f63c9fd606 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 19:22:43 +0000 Subject: [PATCH 807/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6653 (#13400) NuGet.Build.Tasks From Version 5.7.0-preview.3.6645 -> To Version 5.7.0-preview.3.6653 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ac111230247..34a54de0270d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - f548641f11f1a7a0bc27632e9534f1bb1e43a350 + 728c0ad55c093fb374a1858d9cde5dc94b80c244 diff --git a/eng/Versions.props b/eng/Versions.props index 0e6d397b7ded..25badc3caa21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.7.0-preview.3.6645 + 5.7.0-preview.3.6653 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From dcafb9265beb54f6752dca0067248a9b75eb3545 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 20:39:37 +0000 Subject: [PATCH 808/896] Update dependencies from https://github.com/dotnet/cli build 20200618.1 (#4628) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20317.14 -> To Version 3.1.400-preview.20318.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60a82d6323d2..bca77db074a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - fa53ed073a07b725af461f267f6139d2ee3c0677 + 8e5afefea0dda841cb43f80f379175f63c9fd606 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 85b7eb809ca9..5947252a17d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20317.14 + 3.1.400-preview.20318.1 From abe0d3928bb7eef175d507397e09b59492d0b8b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2020 05:43:02 +0000 Subject: [PATCH 809/896] Update dependencies from https://github.com/dotnet/fsharp build 20200618.8 (#4629) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20312.5 -> To Version 10.10.0-beta.20318.8 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca77db074a3..431aa8e2a5a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - 2aa38744c9288aa9ca2bc192c1c85cdb1d1d53a0 + 2a0e24c86a662a1ed676bbfd30272827b6545087 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5947252a17d6..e5d1a54a0aac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20312.5 + 10.10.0-beta.20318.8 From 04526d94b89fc587eee45ce874fa495dc2d03961 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2020 18:26:50 +0000 Subject: [PATCH 810/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#12102) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6653 NuGet.Build.Tasks From Version 5.7.0-preview.3.6645 -> To Version 5.7.0-preview.3.6653 * Update stage 0 * Stage 0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3c9cbf75d15..6e34e93ba917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - f548641f11f1a7a0bc27632e9534f1bb1e43a350 + 728c0ad55c093fb374a1858d9cde5dc94b80c244 diff --git a/eng/Versions.props b/eng/Versions.props index 5776c70630fb..9edc39d5fd3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-preview.3.6645 + 5.7.0-preview.3.6653 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 diff --git a/global.json b/global.json index c1d1a30fa92e..b4e70e06e4b7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015178", + "dotnet": "3.1.400-preview-015185", "vs-opt": { "version": "15.9" } From 7b538213a00ebf81f384d6864c698aad9cf8e892 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2020 19:07:36 +0000 Subject: [PATCH 811/896] Update dependencies from https://github.com/dotnet/sdk build 20200619.4 (#4630) Microsoft.NET.Sdk From Version 3.1.400-preview.20317.6 -> To Version 3.1.400-preview.20319.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 431aa8e2a5a6..dc8c7af7e6de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 8e5afefea0dda841cb43f80f379175f63c9fd606 - + https://github.com/dotnet/sdk - 7594743c4ebaf05b5db3d91db374ed2db5374a59 + 04526d94b89fc587eee45ce874fa495dc2d03961 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index e5d1a54a0aac..266e382745fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20317.6 + 3.1.400-preview.20319.4 From fa96ea21382b09e879b44603298a10676e2ca40b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2020 21:43:38 +0000 Subject: [PATCH 812/896] Update dependencies from https://github.com/dotnet/sdk build 20200619.4 (#13402) Microsoft.NET.Sdk From Version 3.1.400-preview.20317.6 -> To Version 3.1.400-preview.20319.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34a54de0270d..447cd52bd213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 7594743c4ebaf05b5db3d91db374ed2db5374a59 + 04526d94b89fc587eee45ce874fa495dc2d03961 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 25badc3caa21..8281be3c293d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20317.6 + 3.1.400-preview.20319.4 $(MicrosoftNETSdkPackageVersion) From f464a932f22ba43bdbe536e5fd850fb32a472804 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2020 22:54:02 +0000 Subject: [PATCH 813/896] Update dependencies from https://github.com/dotnet/cli build 20200619.1 (#4631) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20318.1 -> To Version 3.1.400-preview.20319.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc8c7af7e6de..eff1f3755eb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 8e5afefea0dda841cb43f80f379175f63c9fd606 + fa96ea21382b09e879b44603298a10676e2ca40b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 266e382745fb..6ca2764e714d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20318.1 + 3.1.400-preview.20319.1 From 39e697f6cee7890caad3402d60a44a7e61d42452 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:08:14 +0000 Subject: [PATCH 814/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6665 (#4632) NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6665 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eff1f3755eb0..a7d5b3be9e88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 728c0ad55c093fb374a1858d9cde5dc94b80c244 + 784274cc9b2002ca73055e8134064261118d8a01 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 6ca2764e714d..a3a8d6c9980c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-preview.3.6653 + 5.7.0-rtm.6665 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 7936d60966728c3f810a8aa4543cfce687546bec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 01:35:50 +0000 Subject: [PATCH 815/896] Update dependencies from https://github.com/dotnet/fsharp build 20200622.3 (#4633) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20318.8 -> To Version 10.10.0-beta.20322.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7d5b3be9e88..c070da16b37c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - 2a0e24c86a662a1ed676bbfd30272827b6545087 + d2743b2bce7105315402717dcc5a6cfde8b5b61e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a3a8d6c9980c..b0d5e73bb677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20318.8 + 10.10.0-beta.20322.3 From e4869f8a5de6ed814bf83fcc3012ba38ac79ffb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:50:20 +0000 Subject: [PATCH 816/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6668 (#4634) NuGet.Build.Tasks From Version 5.7.0-rtm.6665 -> To Version 5.7.0-rtm.6668 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c070da16b37c..8b86d12e839b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 784274cc9b2002ca73055e8134064261118d8a01 + 72fb77af5c0c5dba95296584356173d594373804 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b0d5e73bb677..0acdf923fdbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-rtm.6665 + 5.7.0-rtm.6668 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 868f61e608eb61030328f1b1aa67e7758949ba6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 07:05:57 +0000 Subject: [PATCH 817/896] Update dependencies from https://github.com/dotnet/fsharp build 20200622.7 (#4635) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20322.3 -> To Version 10.10.0-beta.20322.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b86d12e839b..11bdde624e2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 - + https://github.com/dotnet/fsharp - d2743b2bce7105315402717dcc5a6cfde8b5b61e + f578f4abdb447d7c52946932d5fbfe12b3f9f828 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0acdf923fdbe..1dd6f5281c5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20322.3 + 10.10.0-beta.20322.7 From 8907e4e145476baccbbe9422a5273706557373e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 22:00:24 +0000 Subject: [PATCH 818/896] Update dependencies from https://github.com/microsoft/msbuild build 20200623.1 (#4636) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-07 -> To Version 16.7.0-preview-20323-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11bdde624e2d..98038a069512 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 04526d94b89fc587eee45ce874fa495dc2d03961 - + https://github.com/microsoft/msbuild - ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 + a3f63e87d3d8ac9ab52affb453c150b7d4997898 - + https://github.com/microsoft/msbuild - ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 + a3f63e87d3d8ac9ab52affb453c150b7d4997898 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1dd6f5281c5d..ea9a376317c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20310-07 + 16.7.0-preview-20323-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-07 + 16.7.0-preview-20323-01 $(MicrosoftBuildPackageVersion) From 1df0d9ac04277cbb4cd0d5e92ec806fa78dfdf36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 22:33:37 +0000 Subject: [PATCH 819/896] Update dependencies from https://github.com/dotnet/fsharp build 20200623.3 (#4637) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20322.7 -> To Version 10.10.0-beta.20323.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98038a069512..e324a225b317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild a3f63e87d3d8ac9ab52affb453c150b7d4997898 - + https://github.com/dotnet/fsharp - f578f4abdb447d7c52946932d5fbfe12b3f9f828 + 403f594a569bda4ff0f9aafd39b599041a772fb5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ea9a376317c1..8048f3f6ab9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20322.7 + 10.10.0-beta.20323.3 From 9b956a2c9f97a659afd082ecf52b1e9bffb44bd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 23:34:16 +0000 Subject: [PATCH 820/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6670 (#4638) NuGet.Build.Tasks From Version 5.7.0-rtm.6668 -> To Version 5.7.0-rtm.6670 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e324a225b317..a5291aa0eaf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 72fb77af5c0c5dba95296584356173d594373804 + 76c12e524364375549b763c78750372910cb1c19 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8048f3f6ab9c..599d461ddd99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-rtm.6668 + 5.7.0-rtm.6670 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 2fd0695f9da05204c5688d72befdc22761ba85fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 02:46:14 +0000 Subject: [PATCH 821/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#13406) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6665 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6665 * Update stage 0 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6668 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6668 * stage 0 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6670 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6670 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 447cd52bd213..e302b5db36f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 728c0ad55c093fb374a1858d9cde5dc94b80c244 + 76c12e524364375549b763c78750372910cb1c19 diff --git a/eng/Versions.props b/eng/Versions.props index 8281be3c293d..e27d159ca3b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview-015177 + 3.1.400-preview-015187 @@ -57,7 +57,7 @@ - 5.7.0-preview.3.6653 + 5.7.0-rtm.6670 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/global.json b/global.json index d6e411e10ffb..de782763f0f2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015177", + "dotnet": "3.1.400-preview-015187", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From 8b1865e7f7f3d32858709fffa038db31a7bb0542 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 20:10:28 +0000 Subject: [PATCH 822/896] Update dependencies from https://github.com/microsoft/msbuild build 20200624.2 (#4639) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20323-01 -> To Version 16.7.0-preview-20324-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5291aa0eaf3..13ce35cbd7f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 04526d94b89fc587eee45ce874fa495dc2d03961 - + https://github.com/microsoft/msbuild - a3f63e87d3d8ac9ab52affb453c150b7d4997898 + 4511eaf7a7b55e95983bdbd5b4240a20c428cf70 - + https://github.com/microsoft/msbuild - a3f63e87d3d8ac9ab52affb453c150b7d4997898 + 4511eaf7a7b55e95983bdbd5b4240a20c428cf70 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 599d461ddd99..d1ab3e94de6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20323-01 + 16.7.0-preview-20324-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20323-01 + 16.7.0-preview-20324-02 $(MicrosoftBuildPackageVersion) From f5cf646782b6b636f7b48cc571b69949a562a6bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 21:50:14 +0000 Subject: [PATCH 823/896] Update dependencies from https://github.com/microsoft/msbuild build 20200624.3 (#4640) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20324-02 -> To Version 16.7.0-preview-20324-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13ce35cbd7f4..307df068eac3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 04526d94b89fc587eee45ce874fa495dc2d03961 - + https://github.com/microsoft/msbuild - 4511eaf7a7b55e95983bdbd5b4240a20c428cf70 + 9c58e75dd53789be89ba386bc74a3edbd600b460 - + https://github.com/microsoft/msbuild - 4511eaf7a7b55e95983bdbd5b4240a20c428cf70 + 9c58e75dd53789be89ba386bc74a3edbd600b460 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d1ab3e94de6d..37cbc8ad2f4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20324-02 + 16.7.0-preview-20324-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20324-02 + 16.7.0-preview-20324-03 $(MicrosoftBuildPackageVersion) From c1d5902fdbcba3efc935387fb3a947a763c1d7c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 22:54:38 +0000 Subject: [PATCH 824/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#12127) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6665 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6665 * Stage 0 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6668 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6668 * Stage 0 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6670 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6670 * Update stage 0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e34e93ba917..35ab4059480e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 728c0ad55c093fb374a1858d9cde5dc94b80c244 + 76c12e524364375549b763c78750372910cb1c19 diff --git a/eng/Versions.props b/eng/Versions.props index 9edc39d5fd3d..bc57c97e9e8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-preview.3.6653 + 5.7.0-rtm.6670 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 diff --git a/global.json b/global.json index b4e70e06e4b7..8d5d0eb25555 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015185", + "dotnet": "3.1.400-preview-015190", "vs-opt": { "version": "15.9" } From c776df9136ef1698038db0e820d5e5944ec38363 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:55:11 +0000 Subject: [PATCH 825/896] Update dependencies from https://github.com/dotnet/sdk build 20200624.14 (#4641) Microsoft.NET.Sdk From Version 3.1.400-preview.20319.4 -> To Version 3.1.400-preview.20324.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 307df068eac3..6a8dd365ca0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli fa96ea21382b09e879b44603298a10676e2ca40b - + https://github.com/dotnet/sdk - 04526d94b89fc587eee45ce874fa495dc2d03961 + c1d5902fdbcba3efc935387fb3a947a763c1d7c2 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 37cbc8ad2f4f..d6d579d45cec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20319.4 + 3.1.400-preview.20324.14 From 936e5d3d325e8308afe34f7629f8ab28bcbace9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 02:05:18 +0000 Subject: [PATCH 826/896] Update dependencies from https://github.com/dotnet/fsharp build 20200624.3 (#4642) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20323.3 -> To Version 10.10.0-beta.20324.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a8dd365ca0f..4931df865b0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 9c58e75dd53789be89ba386bc74a3edbd600b460 - + https://github.com/dotnet/fsharp - 403f594a569bda4ff0f9aafd39b599041a772fb5 + 2f202ef8898e82e176196b3e45bf4f0e532c833e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d6d579d45cec..5840c4b63f74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20323.3 + 10.10.0-beta.20324.3 From 1b26ace7bbfb0b41d4d566256d19fd3181d0308a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 07:34:06 +0000 Subject: [PATCH 827/896] Update dependencies from https://github.com/dotnet/fsharp build 20200624.5 (#4644) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20324.3 -> To Version 10.10.0-beta.20324.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4931df865b0b..872e9b10742e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 9c58e75dd53789be89ba386bc74a3edbd600b460 - + https://github.com/dotnet/fsharp - 2f202ef8898e82e176196b3e45bf4f0e532c833e + cff1922afcfc2598587697780a6f76f492fcbb65 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5840c4b63f74..2b9d40042644 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20324.3 + 10.10.0-beta.20324.5 From e083025717e7a7c731710352ba9f505a88dfd292 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 15:21:16 +0000 Subject: [PATCH 828/896] Update dependencies from https://github.com/dotnet/cli build 20200623.1 (#4643) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20319.1 -> To Version 3.1.400-preview.20323.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 872e9b10742e..9ff4284fd540 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - fa96ea21382b09e879b44603298a10676e2ca40b + 2fd0695f9da05204c5688d72befdc22761ba85fc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2b9d40042644..c887938d98c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20319.1 + 3.1.400-preview.20323.1 From 578eedc2ab93174701311da94f8758810b4be8e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 15:41:35 +0000 Subject: [PATCH 829/896] Update dependencies from https://github.com/dotnet/sdk build 20200624.14 (#13409) Microsoft.NET.Sdk From Version 3.1.400-preview.20319.4 -> To Version 3.1.400-preview.20324.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e302b5db36f0..d88dab11ee1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 04526d94b89fc587eee45ce874fa495dc2d03961 + c1d5902fdbcba3efc935387fb3a947a763c1d7c2 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e27d159ca3b2..e10ace626004 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20319.4 + 3.1.400-preview.20324.14 $(MicrosoftNETSdkPackageVersion) From f1bcf96d493987b77a67ccabbe6677c9e00b32c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 10:24:57 +0000 Subject: [PATCH 830/896] Update dependencies from https://github.com/dotnet/fsharp build 20200626.1 (#4645) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20324.5 -> To Version 10.10.0-beta.20326.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ff4284fd540..2ea3eb759382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 9c58e75dd53789be89ba386bc74a3edbd600b460 - + https://github.com/dotnet/fsharp - cff1922afcfc2598587697780a6f76f492fcbb65 + d34dab991e71214fa3155e3a5543cbae5cac303d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c887938d98c9..d3c28dace480 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20324.5 + 10.10.0-beta.20326.1 From e85d8d48c8d380e008c0b56b5b3f2de193e95bd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 14:44:41 +0000 Subject: [PATCH 831/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.1 (#4646) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20324-03 -> To Version 16.7.0-preview-20326-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ea3eb759382..0721a99fe4f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - 9c58e75dd53789be89ba386bc74a3edbd600b460 + 236f2e7df37c4f749137767476caf16d5e2b99f2 - + https://github.com/microsoft/msbuild - 9c58e75dd53789be89ba386bc74a3edbd600b460 + 236f2e7df37c4f749137767476caf16d5e2b99f2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d3c28dace480..2d152f6f06bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20324-03 + 16.7.0-preview-20326-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20324-03 + 16.7.0-preview-20326-01 $(MicrosoftBuildPackageVersion) From c6bf33d46d1c7ac1ec7dc07c249349f1518f4621 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 16:24:36 +0000 Subject: [PATCH 832/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.2 (#4647) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-01 -> To Version 16.7.0-preview-20326-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0721a99fe4f5..e2e4fe55a634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - 236f2e7df37c4f749137767476caf16d5e2b99f2 + f274831c493a965e157e25fde6833e759c542f11 - + https://github.com/microsoft/msbuild - 236f2e7df37c4f749137767476caf16d5e2b99f2 + f274831c493a965e157e25fde6833e759c542f11 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2d152f6f06bb..6c5a28195204 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-01 + 16.7.0-preview-20326-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-01 + 16.7.0-preview-20326-02 $(MicrosoftBuildPackageVersion) From ecae9a6b6caadb66ca4f8b97032d04390c0e255b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 17:21:07 +0000 Subject: [PATCH 833/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.3 (#4648) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-02 -> To Version 16.7.0-preview-20326-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2e4fe55a634..99b4d6113107 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - f274831c493a965e157e25fde6833e759c542f11 + 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 - + https://github.com/microsoft/msbuild - f274831c493a965e157e25fde6833e759c542f11 + 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c5a28195204..b4e97abfa64a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-02 + 16.7.0-preview-20326-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-02 + 16.7.0-preview-20326-03 $(MicrosoftBuildPackageVersion) From 94dcf3f06f66d6d48a48a6d5f569dc9d751dadd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 17:22:46 +0000 Subject: [PATCH 834/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-03 -> To Version 16.7.0-preview-20326-05 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99b4d6113107..86952ee333ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 + 2f2f7565afcb51f2222cbfb908c0720d1f7320a6 - + https://github.com/microsoft/msbuild - 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 + 2f2f7565afcb51f2222cbfb908c0720d1f7320a6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b4e97abfa64a..cd5d3311d64d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-03 + 16.7.0-preview-20326-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-03 + 16.7.0-preview-20326-05 $(MicrosoftBuildPackageVersion) From 687263feb669762d7c347f2dadd699ca7def2d11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 17:22:59 +0000 Subject: [PATCH 835/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.6 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-05 -> To Version 16.7.0-preview-20326-06 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86952ee333ce..c3a6c82b91cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - 2f2f7565afcb51f2222cbfb908c0720d1f7320a6 + 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca - + https://github.com/microsoft/msbuild - 2f2f7565afcb51f2222cbfb908c0720d1f7320a6 + 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index cd5d3311d64d..424a20ce2130 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-05 + 16.7.0-preview-20326-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-05 + 16.7.0-preview-20326-06 $(MicrosoftBuildPackageVersion) From b538248ada2904357c975dc63c732bf81de0d43d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 17:23:08 +0000 Subject: [PATCH 836/896] Update dependencies from https://github.com/microsoft/msbuild build 20200626.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-06 -> To Version 16.7.0-preview-20326-04 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3a6c82b91cd..bd2205b87e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk c1d5902fdbcba3efc935387fb3a947a763c1d7c2 - + https://github.com/microsoft/msbuild - 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca + 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/microsoft/msbuild - 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca + 1eab2845bd4dbded49765c0b33641f029ed92c69 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 424a20ce2130..6c026221bc64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-06 + 16.7.0-preview-20326-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-06 + 16.7.0-preview-20326-04 $(MicrosoftBuildPackageVersion) From c1078309e7a8525002a9a42e0dae95f5020dcb33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 18:23:50 +0000 Subject: [PATCH 837/896] Update dependencies from https://github.com/dotnet/arcade build 20200626.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20326.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 964b0651aee7..a36845cdbd7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 9b71be0663493cd0e111b55536a2e1eeb272f54c + ed69753a3ffbdaa08365252c710d57a64d17f859 - + https://github.com/dotnet/arcade - 9b71be0663493cd0e111b55536a2e1eeb272f54c + ed69753a3ffbdaa08365252c710d57a64d17f859 - + https://github.com/dotnet/arcade - 9b71be0663493cd0e111b55536a2e1eeb272f54c + ed69753a3ffbdaa08365252c710d57a64d17f859 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index b20945f6f663..1ebb2c5fe394 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 2.0.0 4.0.0 1.5.0 - 1.0.0-beta.20302.3 + 1.0.0-beta.20326.2 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 256ffbfb93a3..968b39bef5f1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 52e2ff021d70..bf09d2511c65 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -65,7 +65,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 + -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/global.json b/global.json index ea293c9f509f..790ed3545290 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20302.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20326.2" } } From ecaddc7d18c7850f3e5bccfbcf0e4292b8eaa669 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 18:24:08 +0000 Subject: [PATCH 838/896] Update dependencies from https://github.com/dotnet/arcade build 20200626.2 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20326.2 --- eng/Version.Details.xml | 4 ++-- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- global.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45f16bbd881f..283540a11dee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - 9b71be0663493cd0e111b55536a2e1eeb272f54c + ed69753a3ffbdaa08365252c710d57a64d17f859 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 256ffbfb93a3..968b39bef5f1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 52e2ff021d70..bf09d2511c65 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -65,7 +65,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 + -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/global.json b/global.json index 12fbae0ed95c..e9e9de73d5b1 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2" } } From 6f4d531eabafcf8d9f5324cfa1398dd9612d1e6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jun 2020 18:24:09 +0000 Subject: [PATCH 839/896] Update dependencies from https://github.com/dotnet/arcade build 20200626.2 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20326.2 --- eng/Version.Details.xml | 4 ++-- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- global.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8805a89767c..ccf0a41d8b83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - 9b71be0663493cd0e111b55536a2e1eeb272f54c + ed69753a3ffbdaa08365252c710d57a64d17f859 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 256ffbfb93a3..968b39bef5f1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 52e2ff021d70..bf09d2511c65 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -65,7 +65,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 + -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/global.json b/global.json index 55aea45a4b53..28811a7425fe 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2" } } From a1aae55e787f89c6ca80da98821dee1043e7e8c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 19:31:51 +0000 Subject: [PATCH 840/896] Update dependencies from https://github.com/dotnet/fsharp build 20200626.3 (#4650) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20326.1 -> To Version 10.10.0-beta.20326.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99b4d6113107..25e52785bf39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 - + https://github.com/dotnet/fsharp - d34dab991e71214fa3155e3a5543cbae5cac303d + 42f26f2441d3df72a33915000c60cec6ddb297e5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b4e97abfa64a..79abea7d2d22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20326.1 + 10.10.0-beta.20326.3 From d07192fb5dc27bff622a8f8abee505a2d7f0d63e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jun 2020 22:04:15 +0000 Subject: [PATCH 841/896] Update dependencies from https://github.com/dotnet/fsharp build 20200627.5 (#4651) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20326.3 -> To Version 10.10.0-beta.20327.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25e52785bf39..aebd23c6443e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 51300936d0fcf554e8a9c765ddb26fa95ce4fa85 - + https://github.com/dotnet/fsharp - 42f26f2441d3df72a33915000c60cec6ddb297e5 + b74c9de731058d0258f82dac1bddc7688a5fa410 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 79abea7d2d22..91201e39e022 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20326.3 + 10.10.0-beta.20327.5 From dc049ebaab5039df63a6b8821103cd046eb0f9bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jun 2020 07:46:51 +0000 Subject: [PATCH 842/896] Update dependencies from https://github.com/dotnet/cli build 20200627.1 (#4652) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20323.1 -> To Version 3.1.400-preview.20327.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9bcc984965e..13b0380439f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 2fd0695f9da05204c5688d72befdc22761ba85fc + f6f9d923d0b39086ee46f25798ed0e68e672b22f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e355dfcac1b7..7a117b977bd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20323.1 + 3.1.400-preview.20327.1 From 3a59c1f7e16677d8c31e19d85a9be7f656a0a26e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 01:17:03 +0000 Subject: [PATCH 843/896] Update dependencies from https://github.com/dotnet/fsharp build 20200628.2 (#4653) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20327.5 -> To Version 10.10.0-beta.20328.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13b0380439f6..a18c8a24689d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - b74c9de731058d0258f82dac1bddc7688a5fa410 + bab2902ec895cfc53b186eebac47ed0d533ad2eb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7a117b977bd7..9fa6181c6ef8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20327.5 + 10.10.0-beta.20328.2 From 16e4cfda7670c05733dac2ead684da19142c107a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 04:18:13 +0000 Subject: [PATCH 844/896] Update dependencies from https://github.com/dotnet/fsharp build 20200628.3 (#4654) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20328.2 -> To Version 10.10.0-beta.20328.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a18c8a24689d..23adc5f2d3df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - bab2902ec895cfc53b186eebac47ed0d533ad2eb + 2cd49dcaff95f8cade512d525cd70789a2b4588e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 9fa6181c6ef8..c8f26daff638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20328.2 + 10.10.0-beta.20328.3 From 2b66a5b2fbef50df9045afa9ba71593b98ba349c Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 28 Jun 2020 21:24:22 -0700 Subject: [PATCH 845/896] Remove unnecessary reference --- src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 63a8f6ca8173..ded654b09005 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -29,7 +29,6 @@ - From 892f797e10aaf9c76367ab2ac1d423f198b76bb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 12:50:57 +0000 Subject: [PATCH 846/896] Update dependencies from https://github.com/dotnet/fsharp build 20200629.1 (#4655) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20328.3 -> To Version 10.10.0-beta.20329.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23adc5f2d3df..ffc64c3d7378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - 2cd49dcaff95f8cade512d525cd70789a2b4588e + 19c9e2f1b21a66ec90fefae79988b33fc16744fc https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c8f26daff638..f5b689abd382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20328.3 + 10.10.0-beta.20329.1 From 2143424eb2f75a4f929a583c709edd9278a24699 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 16:41:02 +0000 Subject: [PATCH 847/896] Update dependencies from https://github.com/dotnet/sdk build 20200629.2 (#4656) Microsoft.NET.Sdk From Version 3.1.400-preview.20324.14 -> To Version 3.1.400-preview.20329.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fed10d10a7c..f12f42943789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli f6f9d923d0b39086ee46f25798ed0e68e672b22f - + https://github.com/dotnet/sdk - c1d5902fdbcba3efc935387fb3a947a763c1d7c2 + 15c823ade9700b999bda3bca8e2c7987ff265f25 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f5b689abd382..79dd366f3855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20324.14 + 3.1.400-preview.20329.2 From 5ef93536a4d11a02d41f215d5061b7872039baa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 17:14:24 +0000 Subject: [PATCH 848/896] Update dependencies from https://github.com/microsoft/msbuild build 20200629.2 (#4657) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-04 -> To Version 16.7.0-preview-20329-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f12f42943789..0d2f36fe344c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + e2a33003170b038bf0c2414df166b5409d4b9581 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 79dd366f3855..e7a38466296b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20326-04 + 16.7.0-preview-20329-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-04 + 16.7.0-preview-20329-02 $(MicrosoftBuildPackageVersion) From 7d7b247c7dfce8a1862f26ca62cdadd380b41e6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 17:27:00 +0000 Subject: [PATCH 849/896] Update dependencies from https://github.com/dotnet/cli build 20200629.2 (#4658) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20327.1 -> To Version 3.1.400-preview.20329.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d2f36fe344c..43032793ee30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - f6f9d923d0b39086ee46f25798ed0e68e672b22f + 3007d4d873af64873e9dcbc5de459acdb8b3ddcf https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e7a38466296b..f2e02ebc782a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20327.1 + 3.1.400-preview.20329.2 From 0d8146d059532dc535ee13a27d2b69bbfbaea46b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 17:56:33 +0000 Subject: [PATCH 850/896] Update dependencies from https://github.com/dotnet/sdk build 20200629.2 (#13416) Microsoft.NET.Sdk From Version 3.1.400-preview.20324.14 -> To Version 3.1.400-preview.20329.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7185eeb9990..3c902685e5db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - c1d5902fdbcba3efc935387fb3a947a763c1d7c2 + 15c823ade9700b999bda3bca8e2c7987ff265f25 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index e10ace626004..e58a71774702 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20324.14 + 3.1.400-preview.20329.2 $(MicrosoftNETSdkPackageVersion) From 2b6b35e3d10ad468e8d1d9141d3460456113b0c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 19:13:07 +0000 Subject: [PATCH 851/896] Update dependencies from https://github.com/dotnet/cli build 20200629.6 (#4659) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20329.2 -> To Version 3.1.400-preview.20329.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43032793ee30..413820f31aab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 3007d4d873af64873e9dcbc5de459acdb8b3ddcf + 0d8146d059532dc535ee13a27d2b69bbfbaea46b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f2e02ebc782a..f6716a9ac5de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20329.2 + 3.1.400-preview.20329.6 From d8f1dea5ff5ed8da3746a3a81b53fcdb9703f4b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 23:06:15 +0000 Subject: [PATCH 852/896] Update dependencies from https://github.com/dotnet/fsharp build 20200629.4 (#4660) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.1 -> To Version 10.10.0-beta.20329.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 413820f31aab..3747e188cae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,7 +25,7 @@ https://github.com/microsoft/msbuild e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/dotnet/fsharp 19c9e2f1b21a66ec90fefae79988b33fc16744fc diff --git a/eng/Versions.props b/eng/Versions.props index f6716a9ac5de..dbc8ba6a489d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20329.1 + 10.10.0-beta.20329.4 From 31bc1d8acff914077b36af8f34b31da17395e89f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 00:07:35 +0000 Subject: [PATCH 853/896] Update dependencies from https://github.com/dotnet/fsharp build 20200629.5 (#4661) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.4 -> To Version 10.10.0-beta.20329.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3747e188cae3..3f9d306f5c0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,7 +25,7 @@ https://github.com/microsoft/msbuild e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/dotnet/fsharp 19c9e2f1b21a66ec90fefae79988b33fc16744fc diff --git a/eng/Versions.props b/eng/Versions.props index dbc8ba6a489d..de019e5a951e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20329.4 + 10.10.0-beta.20329.5 From ab7a8528ffb0cb98a0a96a49f695cf6ac4a84a5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 03:25:05 +0000 Subject: [PATCH 854/896] Update dependencies from https://github.com/microsoft/msbuild build 20200630.1 (#4662) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20329-02 -> To Version 16.7.0-preview-20330-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f9d306f5c0e..7d686ceb5c34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - e2a33003170b038bf0c2414df166b5409d4b9581 + 32b3e5871d2cf119379286d079f623475f3597bb - + https://github.com/microsoft/msbuild - e2a33003170b038bf0c2414df166b5409d4b9581 + 32b3e5871d2cf119379286d079f623475f3597bb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index de019e5a951e..c3e59cc182e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20329-02 + 16.7.0-preview-20330-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20329-02 + 16.7.0-preview-20330-01 $(MicrosoftBuildPackageVersion) From 942677768e6e7dd52230c437d919979005822771 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 03:35:34 +0000 Subject: [PATCH 855/896] Update dependencies from https://github.com/microsoft/msbuild build 20200630.2 (#4663) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-01 -> To Version 16.7.0-preview-20330-02 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d686ceb5c34..f6c3dc5845df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - 32b3e5871d2cf119379286d079f623475f3597bb + 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/microsoft/msbuild - 32b3e5871d2cf119379286d079f623475f3597bb + 1eab2845bd4dbded49765c0b33641f029ed92c69 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c3e59cc182e8..34a7ce622940 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20330-01 + 16.7.0-preview-20330-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-01 + 16.7.0-preview-20330-02 $(MicrosoftBuildPackageVersion) From 563dd87ab224587d95d97abcb2653f4d31d6228e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 17:14:51 +0000 Subject: [PATCH 856/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6677 (#4664) NuGet.Build.Tasks From Version 5.7.0-rtm.6670 -> To Version 5.7.0-rtm.6677 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6c3dc5845df..f699c973af9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 76c12e524364375549b763c78750372910cb1c19 + 088004379cb99890f766e9b7a0a29f7b080f888b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 34a7ce622940..575f17e7a72b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-rtm.6670 + 5.7.0-rtm.6677 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 785bf3d5aaecbc705b6c9356abc8eebb0a51de23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 17:36:01 +0000 Subject: [PATCH 857/896] Update dependencies from https://github.com/microsoft/msbuild build 20200630.6 (#4665) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-02 -> To Version 16.7.0-preview-20330-06 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f699c973af9a..efec14346909 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + de74df7507bbb93563fec6c1a8252b5750597283 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + de74df7507bbb93563fec6c1a8252b5750597283 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 575f17e7a72b..b26a7106ee01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20330-02 + 16.7.0-preview-20330-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-02 + 16.7.0-preview-20330-06 $(MicrosoftBuildPackageVersion) From e314f9945dcac85b70e036e65d7acd527426b642 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 20:57:12 +0000 Subject: [PATCH 858/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#13417) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6677 NuGet.Build.Tasks From Version 5.7.0-rtm.6670 -> To Version 5.7.0-rtm.6677 * Update stage 0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c902685e5db..f25a1698795e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 76c12e524364375549b763c78750372910cb1c19 + 088004379cb99890f766e9b7a0a29f7b080f888b diff --git a/eng/Versions.props b/eng/Versions.props index e58a71774702..23616603c6d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview-015187 + 3.1.400-preview-015197 @@ -57,7 +57,7 @@ - 5.7.0-rtm.6670 + 5.7.0-rtm.6677 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/global.json b/global.json index 63fcd70d427c..4a296ca06f65 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015187", + "dotnet": "3.1.400-preview-015197", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From 17e027cb5b81e30266b96529421f2465010e355b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 21:41:29 +0000 Subject: [PATCH 859/896] Update dependencies from https://github.com/microsoft/msbuild build 20200630.7 (#4666) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-06 -> To Version 16.7.0-preview-20330-07 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efec14346909..72fafac887f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - de74df7507bbb93563fec6c1a8252b5750597283 + 2ec12e962575749b1d20880089bffd667335a451 - + https://github.com/microsoft/msbuild - de74df7507bbb93563fec6c1a8252b5750597283 + 2ec12e962575749b1d20880089bffd667335a451 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b26a7106ee01..3577aa021fab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20330-06 + 16.7.0-preview-20330-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-06 + 16.7.0-preview-20330-07 $(MicrosoftBuildPackageVersion) From fc9c13d2de4cfcccf7f9945ca0b2006348019630 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 22:09:07 +0000 Subject: [PATCH 860/896] Update dependencies from https://github.com/microsoft/msbuild build 20200630.8 (#4667) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-07 -> To Version 16.7.0-preview-20330-08 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72fafac887f0..e3ad12b543fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 15c823ade9700b999bda3bca8e2c7987ff265f25 - + https://github.com/microsoft/msbuild - 2ec12e962575749b1d20880089bffd667335a451 + 96403c598a166e5a06933f78ace75528a1d1f3b0 - + https://github.com/microsoft/msbuild - 2ec12e962575749b1d20880089bffd667335a451 + 96403c598a166e5a06933f78ace75528a1d1f3b0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3577aa021fab..0737633480d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20330-07 + 16.7.0-preview-20330-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-07 + 16.7.0-preview-20330-08 $(MicrosoftBuildPackageVersion) From d63dd417ea7492181d023e4135918d582a5ce806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 22:18:30 +0000 Subject: [PATCH 861/896] Update dependencies from https://github.com/dotnet/cli build 20200630.1 (#4668) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20329.6 -> To Version 3.1.400-preview.20330.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3ad12b543fa..b053496af516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 0d8146d059532dc535ee13a27d2b69bbfbaea46b + e314f9945dcac85b70e036e65d7acd527426b642 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0737633480d1..e27d4e622296 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20329.6 + 3.1.400-preview.20330.1 From a99cb0ac6abb55577041c096a75ff7008a807994 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 03:14:48 +0000 Subject: [PATCH 862/896] [release/3.1.4xx] Update dependencies from nuget/nuget.client (#12283) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6677 NuGet.Build.Tasks From Version 5.7.0-rtm.6670 -> To Version 5.7.0-rtm.6677 * Stage 0 * Stage 0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53eaff2a1326..5b19fbd9b026 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 76c12e524364375549b763c78750372910cb1c19 + 088004379cb99890f766e9b7a0a29f7b080f888b diff --git a/eng/Versions.props b/eng/Versions.props index 442a3ecc3c13..3db4706ac6a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-rtm.6670 + 5.7.0-rtm.6677 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 diff --git a/global.json b/global.json index 8dc2de783e05..b2eb5f198521 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015190", + "dotnet": "3.1.400-preview-015201", "vs-opt": { "version": "15.9" } From 2ff250ce982df9184d27734e471f1862d5408114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 03:52:22 +0000 Subject: [PATCH 863/896] Update dependencies from https://github.com/dotnet/sdk build 20200630.17 (#4669) Microsoft.NET.Sdk From Version 3.1.400-preview.20329.2 -> To Version 3.1.400-preview.20330.17 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b053496af516..fff40fff4e6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli e314f9945dcac85b70e036e65d7acd527426b642 - + https://github.com/dotnet/sdk - 15c823ade9700b999bda3bca8e2c7987ff265f25 + a99cb0ac6abb55577041c096a75ff7008a807994 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index e27d4e622296..840116b1c6a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20329.2 + 3.1.400-preview.20330.17 From 0ba47b901d581feb68e774e0f691d0b68269311e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 04:12:34 +0000 Subject: [PATCH 864/896] Update dependencies from https://github.com/dotnet/sdk build 20200630.17 (#13418) Microsoft.NET.Sdk From Version 3.1.400-preview.20329.2 -> To Version 3.1.400-preview.20330.17 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f25a1698795e..a63a3d19b5d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 15c823ade9700b999bda3bca8e2c7987ff265f25 + a99cb0ac6abb55577041c096a75ff7008a807994 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 23616603c6d1..db48c428923d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20329.2 + 3.1.400-preview.20330.17 $(MicrosoftNETSdkPackageVersion) From d4b19d012abfc097d7bd288b29c35ac7c55120fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 05:09:10 +0000 Subject: [PATCH 865/896] Update dependencies from https://github.com/dotnet/cli build 20200630.2 (#4670) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20330.1 -> To Version 3.1.400-preview.20330.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fff40fff4e6a..53533728c619 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - e314f9945dcac85b70e036e65d7acd527426b642 + 0ba47b901d581feb68e774e0f691d0b68269311e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 840116b1c6a9..847c2e38c924 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20330.1 + 3.1.400-preview.20330.2 From 6598bc207f243c198fb939dd48c135d7def00d90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Jul 2020 14:30:37 +0000 Subject: [PATCH 866/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6686 NuGet.Build.Tasks From Version 5.7.0-rtm.6677 -> To Version 5.7.0-rtm.6686 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b19fbd9b026..6d9cd1351504 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/NuGet/NuGet.Client - 088004379cb99890f766e9b7a0a29f7b080f888b + bd482514a87a0085f8eb8603842ee1cb3ca5f277 diff --git a/eng/Versions.props b/eng/Versions.props index 3db4706ac6a5..75860e16aab2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 3.1.2 2.0.1-servicing-26011-01 9.0.1 - 5.7.0-rtm.6677 + 5.7.0-rtm.6686 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) 2.0.0 From 842a30d3db1c26471eadb469a3fb1b0279cd769a Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 7 Jul 2020 00:02:01 -0700 Subject: [PATCH 867/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index b2eb5f198521..22f0e9fb6ee2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015201", + "dotnet": "3.1.400-preview-015203", "vs-opt": { "version": "15.9" } From 802a4118be2064ad587644c20179682a1cb3d867 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:38:16 +0000 Subject: [PATCH 868/896] Update dependencies from https://github.com/microsoft/msbuild build 20200706.3 (#4671) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-08 -> To Version 16.7.0-preview-20356-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53533728c619..c893687f159b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,11 +17,11 @@ https://github.com/dotnet/sdk a99cb0ac6abb55577041c096a75ff7008a807994 - + https://github.com/microsoft/msbuild 96403c598a166e5a06933f78ace75528a1d1f3b0 - + https://github.com/microsoft/msbuild 96403c598a166e5a06933f78ace75528a1d1f3b0 diff --git a/eng/Versions.props b/eng/Versions.props index 847c2e38c924..6f44b539f79c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20330-08 + 16.7.0-preview-20356-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-08 + 16.7.0-preview-20356-03 $(MicrosoftBuildPackageVersion) From d8887614eade05909a5adac627697764cd5fcf05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2020 19:20:57 +0000 Subject: [PATCH 869/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6686 (#4672) NuGet.Build.Tasks From Version 5.7.0-rtm.6677 -> To Version 5.7.0-rtm.6686 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c893687f159b..ccfc3a4ef4c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - 088004379cb99890f766e9b7a0a29f7b080f888b + bd482514a87a0085f8eb8603842ee1cb3ca5f277 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 6f44b539f79c..2c7a2634ef60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-rtm.6677 + 5.7.0-rtm.6686 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 06c24261d8dfff105342ef25b666abcff7a10d0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 03:04:07 +0000 Subject: [PATCH 870/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6686 (#13419) NuGet.Build.Tasks From Version 5.7.0-rtm.6677 -> To Version 5.7.0-rtm.6686 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a63a3d19b5d2..36b774afa390 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - 088004379cb99890f766e9b7a0a29f7b080f888b + bd482514a87a0085f8eb8603842ee1cb3ca5f277 diff --git a/eng/Versions.props b/eng/Versions.props index db48c428923d..011a28cd41a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.7.0-rtm.6677 + 5.7.0-rtm.6686 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 6e3ecb110bdfde57a87ed62c97f23ddf4ef6a5b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 04:03:07 +0000 Subject: [PATCH 871/896] Update dependencies from https://github.com/dotnet/cli build 20200707.1 (#4673) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20330.2 -> To Version 3.1.400-preview.20357.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccfc3a4ef4c9..96dcff10aef0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 0ba47b901d581feb68e774e0f691d0b68269311e + 06c24261d8dfff105342ef25b666abcff7a10d0b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2c7a2634ef60..47e0b72012d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20330.2 + 3.1.400-preview.20357.1 From d73281bc4b70d3731a393d03a6871d3d1ded8890 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 8 Jul 2020 01:57:06 -0700 Subject: [PATCH 872/896] Update stage 0 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 22f0e9fb6ee2..b27275e40174 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015203", + "dotnet": "3.1.400-preview-015204", "vs-opt": { "version": "15.9" } From e3f2649363c4bb0e07c58c0cff05004a5669505f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 00:48:48 +0000 Subject: [PATCH 873/896] Update dependencies from https://github.com/microsoft/msbuild build 20200709.1 (#4674) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20356-03 -> To Version 16.7.0-preview-20359-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96dcff10aef0..2267fb9b7000 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk a99cb0ac6abb55577041c096a75ff7008a807994 - + https://github.com/microsoft/msbuild - 96403c598a166e5a06933f78ace75528a1d1f3b0 + 29609438b47acb32744163fa618a60f3aa478435 - + https://github.com/microsoft/msbuild - 96403c598a166e5a06933f78ace75528a1d1f3b0 + 29609438b47acb32744163fa618a60f3aa478435 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47e0b72012d7..68879ab95c73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20356-03 + 16.7.0-preview-20359-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20356-03 + 16.7.0-preview-20359-01 $(MicrosoftBuildPackageVersion) From 41ecfd63d7369df189e64b895c5fd5eb30e3b4bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 03:02:45 +0000 Subject: [PATCH 874/896] Update dependencies from https://github.com/dotnet/sdk build 20200708.5 (#4675) Microsoft.NET.Sdk From Version 3.1.400-preview.20330.17 -> To Version 3.1.400-preview.20358.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2267fb9b7000..78b376f71df2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 06c24261d8dfff105342ef25b666abcff7a10d0b - + https://github.com/dotnet/sdk - a99cb0ac6abb55577041c096a75ff7008a807994 + 7a07692dcfcff7705cda9bc2a5f12779f4c4d7e7 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 68879ab95c73..6c37eec300da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20330.17 + 3.1.400-preview.20358.5 From 56e244d15cdfef9aff9203237fac9324249eaa38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 06:24:13 +0000 Subject: [PATCH 875/896] Update dependencies from https://github.com/dotnet/sdk build 20200708.5 (#13420) Microsoft.NET.Sdk From Version 3.1.400-preview.20330.17 -> To Version 3.1.400-preview.20358.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36b774afa390..85acf8851cb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - a99cb0ac6abb55577041c096a75ff7008a807994 + 7a07692dcfcff7705cda9bc2a5f12779f4c4d7e7 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 011a28cd41a2..351c1a2085cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20330.17 + 3.1.400-preview.20358.5 $(MicrosoftNETSdkPackageVersion) From f82edc00ef77399969b0287b4943931083ca8c93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 07:14:38 +0000 Subject: [PATCH 876/896] Update dependencies from https://github.com/dotnet/cli build 20200708.1 (#4676) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20357.1 -> To Version 3.1.400-preview.20358.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78b376f71df2..b098d11447ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 06c24261d8dfff105342ef25b666abcff7a10d0b + 56e244d15cdfef9aff9203237fac9324249eaa38 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6c37eec300da..d37e838f9bd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20357.1 + 3.1.400-preview.20358.1 From aa0fb1f71c3f3c4796bf9a5734a9fcf47cba7389 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 17:13:35 +0000 Subject: [PATCH 877/896] Update dependencies from https://github.com/microsoft/msbuild build 20200710.3 (#4677) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20359-01 -> To Version 16.7.0-preview-20360-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b098d11447ce..b76e29fb4ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,13 +17,13 @@ https://github.com/dotnet/sdk 7a07692dcfcff7705cda9bc2a5f12779f4c4d7e7 - + https://github.com/microsoft/msbuild - 29609438b47acb32744163fa618a60f3aa478435 + 188921e2ffecf6c74dd4583cf01b62465fcbee3c - + https://github.com/microsoft/msbuild - 29609438b47acb32744163fa618a60f3aa478435 + 188921e2ffecf6c74dd4583cf01b62465fcbee3c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d37e838f9bd0..3dd2a6adf5f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,10 +21,10 @@ - 16.7.0-preview-20359-01 + 16.7.0-preview-20360-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20359-01 + 16.7.0-preview-20360-03 $(MicrosoftBuildPackageVersion) From a9f81b450613950a2b4bbd9e7dae76523a8ab91d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:18:52 +0000 Subject: [PATCH 878/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6702 (#4678) NuGet.Build.Tasks From Version 5.7.0-rtm.6686 -> To Version 5.7.0-rtm.6702 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b76e29fb4ecd..53b6bd3498bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/wpf 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 - + https://github.com/NuGet/NuGet.Client - bd482514a87a0085f8eb8603842ee1cb3ca5f277 + cd51d2637fc533e1e188c860e7616107904a3623 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 3dd2a6adf5f5..47fa98d103b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 5.7.0-rtm.6686 + 5.7.0-rtm.6702 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From fff865a7d47ee01728960c09d1c6423cfc2d5e26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2020 00:19:50 +0000 Subject: [PATCH 879/896] Update dependencies from https://github.com/dotnet/sdk build 20200710.11 (#4679) Microsoft.NET.Sdk From Version 3.1.400-preview.20358.5 -> To Version 3.1.400-preview.20360.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b6bd3498bb..65662105ff08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli 56e244d15cdfef9aff9203237fac9324249eaa38 - + https://github.com/dotnet/sdk - 7a07692dcfcff7705cda9bc2a5f12779f4c4d7e7 + 7272da4b33c8f184e79561614a79f6a76725bb4f https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 47fa98d103b5..811c1a92c029 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20358.5 + 3.1.400-preview.20360.11 From 5099b6581116a24f7ce1b1176102f16c3db576f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2020 00:40:00 +0000 Subject: [PATCH 880/896] Update dependencies from https://github.com/dotnet/sdk build 20200710.11 (#13423) Microsoft.NET.Sdk From Version 3.1.400-preview.20358.5 -> To Version 3.1.400-preview.20360.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85acf8851cb8..230f21ef8d85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 7a07692dcfcff7705cda9bc2a5f12779f4c4d7e7 + 7272da4b33c8f184e79561614a79f6a76725bb4f https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 351c1a2085cb..d9d12277c4d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20358.5 + 3.1.400-preview.20360.11 $(MicrosoftNETSdkPackageVersion) From ea6f5ec81ce2b030f502d948c6e1133b2edfe12b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2020 01:43:24 +0000 Subject: [PATCH 881/896] Update dependencies from https://github.com/dotnet/cli build 20200710.1 (#4680) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20358.1 -> To Version 3.1.400-preview.20360.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65662105ff08..bc4ec7129f18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 56e244d15cdfef9aff9203237fac9324249eaa38 + 5099b6581116a24f7ce1b1176102f16c3db576f0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 811c1a92c029..0b43a8eeb427 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20358.1 + 3.1.400-preview.20360.1 From d2ebe8938be4db8c69c2d205d271f58013725296 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2020 23:02:39 +0000 Subject: [PATCH 882/896] Update dependencies from https://github.com/dotnet/fsharp build 20200711.3 (#4681) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.5 -> To Version 10.10.0-beta.20361.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc4ec7129f18..261b9721c02e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,9 +25,9 @@ https://github.com/microsoft/msbuild 188921e2ffecf6c74dd4583cf01b62465fcbee3c - + https://github.com/dotnet/fsharp - 19c9e2f1b21a66ec90fefae79988b33fc16744fc + 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0b43a8eeb427..141ca7a6b98a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 10.10.0-beta.20329.5 + 10.10.0-beta.20361.3 From 004ce0c48b75d1097ed9e17b035d61e19f2b85df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 09:47:47 +0000 Subject: [PATCH 883/896] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6702 (#13422) NuGet.Build.Tasks From Version 5.7.0-rtm.6686 -> To Version 5.7.0-rtm.6702 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 230f21ef8d85..c8107073b01c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,9 +60,9 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/NuGet/NuGet.Client - bd482514a87a0085f8eb8603842ee1cb3ca5f277 + cd51d2637fc533e1e188c860e7616107904a3623 diff --git a/eng/Versions.props b/eng/Versions.props index d9d12277c4d2..554b209535df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ - 5.7.0-rtm.6686 + 5.7.0-rtm.6702 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 1963117126df3ec2f7242bbb36586a3afec16efb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 10:56:33 +0000 Subject: [PATCH 884/896] Update dependencies from https://github.com/dotnet/cli build 20200713.1 (#4682) Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20360.1 -> To Version 3.1.400-preview.20363.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 261b9721c02e..8d303a42a615 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://github.com/dotnet/core-setup 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/cli - 5099b6581116a24f7ce1b1176102f16c3db576f0 + 004ce0c48b75d1097ed9e17b035d61e19f2b85df https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 141ca7a6b98a..cda9e3af84fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20360.1 + 3.1.400-preview.20363.1 From 551845e57be354fa47972f03ac8989f40483e809 Mon Sep 17 00:00:00 2001 From: Luke Westendorf Date: Mon, 13 Jul 2020 16:37:07 -0700 Subject: [PATCH 885/896] Fixing merge issues --- .../targets/Microsoft.NET.Publish.targets | 2 +- .../Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index a612bc378f79..66f66638f869 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -1130,7 +1130,7 @@ Copyright (c) .NET Foundation. All rights reserved. ============================================================ --> diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs index a4f65424ba57..75f7626f11db 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs @@ -112,7 +112,7 @@ public void GroupBuildsWithoutPublish() var buildCommand = new BuildCommand(testAsset); buildCommand - .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true", "/t:Publish;PublishItemsOutputGroup") + .Execute("/p:RuntimeIdentifier=win-x86;DesignTimeBuild=true", "/t:PublishItemsOutputGroup") .Should() .Pass(); From 0c810c926f429d54104047a644388705db8d1e6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2020 02:11:07 +0000 Subject: [PATCH 886/896] Update dependencies from https://github.com/dotnet/roslyn build 20200714.1 (#4683) Microsoft.Net.Compilers.Toolset From Version 3.7.0-3.20312.3 -> To Version 3.7.0-4.20364.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d303a42a615..00a4acd1a3a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - ec4841263590f5456e32728d98097e97c1605e22 + 9d16f1782ca3e9ec7117d0be0e49b85fb9c80ea7 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index cda9e3af84fc..ca2a153689c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-3.20312.3 + 3.7.0-4.20364.1 From e2a91b6265ff4fe66b8ae8959d630a109b5f0ea9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2020 07:59:11 +0000 Subject: [PATCH 887/896] Update dependencies from https://github.com/dotnet/roslyn build 20200715.2 (#4686) Microsoft.Net.Compilers.Toolset From Version 3.7.0-4.20364.1 -> To Version 3.7.0-5.20365.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00a4acd1a3a3..a2237238a87b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - 9d16f1782ca3e9ec7117d0be0e49b85fb9c80ea7 + 598796cd274b852b5be35398133516e19f543744 https://github.com/dotnet/aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index ca2a153689c9..a2b27151ea03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-4.20364.1 + 3.7.0-5.20365.2 From d8ac267c9fb9fee570c261a3ba8e99e593aa792e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jul 2020 09:49:13 -0700 Subject: [PATCH 888/896] Insert 3.1.6 runtime (#4685) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2237238a87b..df4537698e7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c https://github.com/dotnet/cli @@ -33,14 +33,14 @@ https://github.com/dotnet/roslyn 598796cd274b852b5be35398133516e19f543744 - - https://github.com/dotnet/aspnetcore-tooling - 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + d63ec4a166a5c4f40fcbb823873cfa68cfd39eae - - https://github.com/dotnet/wpf - 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + aab0cc88e5666c8cbb9710979ffdd6a0e7e4ebf2 https://github.com/NuGet/NuGet.Client @@ -66,13 +66,13 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 diff --git a/eng/Versions.props b/eng/Versions.props index a2b27151ea03..f7038245be3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 3.1.2 + 3.1.6 @@ -72,15 +72,15 @@ 4.7.0 - 4.7.0 + 4.7.1 4.7.0 - 4.7.0 + 4.7.1 3.1.0 - 3.1.2-servicing.20067.4 - 3.1.2 + 3.1.6-servicing.20316.4 + 3.1.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) From db1e18b416bef1d0b2c2cdb04c93742163637652 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jul 2020 09:49:30 -0700 Subject: [PATCH 889/896] Insert 3.1.6 runtime (#13428) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8107073b01c..4370699e3852 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,39 +1,39 @@ - + https://github.com/dotnet/templating - 247f60e9e34a03ed99e855eb1ea0c20931a968db + 3a2d6426513c7add0c1c140165d528c33e62bc21 - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/corefx - e946cebe43a510e8c6476bbc8185d1445df33a1a + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 62c098bc170f50feca15916e81cb7f321ffc52ff @@ -52,9 +52,9 @@ https://github.com/dotnet/sdk 7272da4b33c8f184e79561614a79f6a76725bb4f - - https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 554b209535df..499cc5b2989f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,17 +18,17 @@ 3.1.0 - 3.1.2 + 3.1.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 3.1.2-servicing.20067.4 - 3.1.2 - 3.1.2 - 3.1.2 - 3.1.2 + 3.1.6-servicing.20316.4 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 - 3.1.2-servicing.20068.1 + 3.1.6-servicing.20317.14 @@ -44,7 +44,7 @@ - 3.1.2-servicing.20064.1 + 3.1.6-servicing.20311.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From d6add9eaa541e45ee0012c5093e6b2710e1d9f3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2020 20:05:26 +0000 Subject: [PATCH 890/896] [release/3.1.4xx] Update dependencies from dotnet/cli (#4687) * Update dependencies from https://github.com/dotnet/cli build 20200715.4 Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20363.1 -> To Version 3.1.400-preview.20365.4 * Remove int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Will Godbe --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 501b40803f3a..b9abe9e7f79f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df4537698e7e..461c8a4b4b05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://github.com/dotnet/cli - 004ce0c48b75d1097ed9e17b035d61e19f2b85df + db1e18b416bef1d0b2c2cdb04c93742163637652 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f7038245be3c..4cde99adee2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20363.1 + 3.1.400-preview.20365.4 From dfaa01282ad9453dd543fb1fe62de85bafd8b811 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 07:26:29 +0000 Subject: [PATCH 891/896] [release/3.1.4xx] Update dependencies from dotnet/sdk (#4691) * Update dependencies from https://github.com/dotnet/sdk build 20200715.20 Microsoft.NET.Sdk From Version 3.1.400-preview.20360.11 -> To Version 3.1.400-preview.20365.20 * remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 461c8a4b4b05..65665041b5f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/cli db1e18b416bef1d0b2c2cdb04c93742163637652 - + https://github.com/dotnet/sdk - 7272da4b33c8f184e79561614a79f6a76725bb4f + b501745abdf35363aa5f1caa95d9086594c49366 https://github.com/microsoft/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4cde99adee2a..5c4a451ef638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 3.1.400-preview.20360.11 + 3.1.400-preview.20365.20 From 5e9fcfdaf23b2f024eeb7f660646d74289e56c98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 07:34:17 +0000 Subject: [PATCH 892/896] [release/3.1.4xx] Update dependencies from dotnet/arcade (#4689) * Update dependencies from https://github.com/dotnet/arcade build 20200715.6 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20326.2 -> To Version 1.0.0-beta.20365.6 * Remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 4 ++-- eng/common/templates/post-build/post-build.yml | 12 ++++++++++++ global.json | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65665041b5f1..ab1169d63f28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ - + https://github.com/dotnet/arcade - ed69753a3ffbdaa08365252c710d57a64d17f859 + 7cc59275eade471e29b88a797275818b0d513d0f diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e1cff6e70298..2d51c1cdbf63 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -355,6 +355,18 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_8_Publishing' + channelName: 'VS 16.8' + channelId: 1154 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/global.json b/global.json index e9e9de73d5b1..1eda999b1012 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20365.6" } } From 87363bec9e621d75279289f06db9eab48edaf628 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 07:45:25 +0000 Subject: [PATCH 893/896] [release/3.1.4xx] Update dependencies from dotnet/roslyn (#4688) * Update dependencies from https://github.com/dotnet/roslyn build 20200716.1 Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.1 * Update dependencies from https://github.com/dotnet/roslyn build 20200716.7 Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.7 * Update dependencies from https://github.com/dotnet/roslyn build 20200717.1 Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20367.1 * Remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab1169d63f28..4b8562e4774f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - 598796cd274b852b5be35398133516e19f543744 + f96dcbb6597fcc801970ee09688e733b64ce9040 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling diff --git a/eng/Versions.props b/eng/Versions.props index 5c4a451ef638..674c3acb9155 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.7.0-5.20365.2 + 3.7.0-5.20367.1 From 409cc2ab9fe95a28fae81c6aa86dbfce5d543d5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 09:31:53 +0000 Subject: [PATCH 894/896] [release/3.1.4xx] Update dependencies from dotnet/arcade (#13435) * Update dependencies from https://github.com/dotnet/arcade build 20200715.6 Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20326.2 -> To Version 1.0.0-beta.20365.6 * Update stage 0 * Remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- eng/common/templates/post-build/post-build.yml | 12 ++++++++++++ global.json | 4 ++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 422b319cc6e2..2b672bb08a79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4370699e3852..645df6ce3c54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ - + https://github.com/dotnet/arcade - ed69753a3ffbdaa08365252c710d57a64d17f859 + 7cc59275eade471e29b88a797275818b0d513d0f diff --git a/eng/Versions.props b/eng/Versions.props index 499cc5b2989f..b49969f37336 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview-015197 + 3.1.400-preview-015208 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e1cff6e70298..2d51c1cdbf63 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -355,6 +355,18 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_8_Publishing' + channelName: 'VS 16.8' + channelId: 1154 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/global.json b/global.json index 4a296ca06f65..84aeb67e369d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.400-preview-015197", + "dotnet": "3.1.400-preview-015208", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20365.6" } } From 1c31b91e9e8a7a7b635674f7072ca6ce16897684 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 10:28:04 +0000 Subject: [PATCH 895/896] [release/3.1.4xx] Update dependencies from dotnet/sdk (#13437) * Update dependencies from https://github.com/dotnet/sdk build 20200715.20 Microsoft.NET.Sdk From Version 3.1.400-preview.20360.11 -> To Version 3.1.400-preview.20365.20 * Update stage 0 * Remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 645df6ce3c54..59ed0a6d200f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,9 +48,9 @@ - + https://github.com/dotnet/sdk - 7272da4b33c8f184e79561614a79f6a76725bb4f + b501745abdf35363aa5f1caa95d9086594c49366 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup diff --git a/eng/Versions.props b/eng/Versions.props index b49969f37336..50e602655720 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 3.1.400-preview.20360.11 + 3.1.400-preview.20365.20 $(MicrosoftNETSdkPackageVersion) From 01eb9ad7b33e76cc0cb585361cf96ff2675daacd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2020 08:27:09 +0000 Subject: [PATCH 896/896] [release/3.1.4xx] Update dependencies from dotnet/cli (#4693) * Update dependencies from https://github.com/dotnet/cli build 20200717.1 Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.1 * Update dependencies from https://github.com/dotnet/cli build 20200717.2 Microsoft.DotNet.Cli.Runtime From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.2 * Remove darc int feeds Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b8562e4774f..9995cb021389 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://github.com/dotnet/cli - db1e18b416bef1d0b2c2cdb04c93742163637652 + 1c31b91e9e8a7a7b635674f7072ca6ce16897684 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 674c3acb9155..08ce6fce6001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ - 3.1.400-preview.20365.4 + 3.1.400-preview.20367.2