From 606f8a8f51d554c06bf58b9cd8a5adcad94afa31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:42 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3038e77bd..770df6dcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd34ec5..3f19cb1f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..14686b8c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From 7a0e084715e88a009bd2598531cd9ed239cf76b2 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 27 Mar 2023 14:42:15 -0500 Subject: [PATCH 2/8] Shutdown the build server before each build. (#15894) Co-authored-by: Michael Simons --- src/SourceBuild/tarball/content/repos/Directory.Build.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 7bf88fdd6..ae06ba154 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -376,6 +376,9 @@ DependsOnTargets="BuildRepoReferences" Inputs="$(MSBuildProjectFullPath)" Outputs="$(RepoCompletedSemaphorePath)Build.complete"> + + + From ce55da54c1143231b7776970e0364fa64789cf99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:00:57 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/test-templates build 20230331.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f19cb1f8..bbf895c1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 diff --git a/eng/Versions.props b/eng/Versions.props index 14686b8c7..2dfd5bc0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 From 57733356964e5dc69700514f0bc322e81771b7fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:54:43 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/test-templates build 20230331.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbf895c1a..754445cd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 diff --git a/eng/Versions.props b/eng/Versions.props index 2dfd5bc0c..62c48b38f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 From 138c3bbdf4c91b75a57e623bdeba4df7782bc435 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:55 -0700 Subject: [PATCH 5/8] Update branding to 7.0.204 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..0361d3816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 157f63c3242703cec4e7de0810d97248e36de129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Apr 2023 19:00:51 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/test-templates build 20230404.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23204.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 754445cd7..12d976155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 diff --git a/eng/Versions.props b/eng/Versions.props index 62c48b38f..f872b0e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From b3367914b9605208b6f663e4d41c2cf89e8e5279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:28:49 +0000 Subject: [PATCH 7/8] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15992) [release/7.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a4a7132..768037280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..15f39434d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fad2e3b62e02ad9f9295d7621db4082d9095fad Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 6 Apr 2023 23:17:45 -0700 Subject: [PATCH 8/8] Revert the changes to the files in the eng/folder --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 768037280..b2a4a7132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 diff --git a/eng/Versions.props b/eng/Versions.props index 5fd9ee1c2..324ebcd81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)