From 4a89f33d29dc0154b83275f59844a38a724d81fa Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Apr 2022 12:58:57 -0700 Subject: [PATCH 1/6] Update branding to 6.0.105 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6a0c76e05..678e2a40a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9ab192a3a9b84df50585773dcc404b1f38ae832a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Apr 2022 12:59:02 -0700 Subject: [PATCH 2/6] Update branding to 6.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..acb24212e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e70e2b3f4943ddf073114bf56349fa7abe7a63fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 15:11:36 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b91798abb..ce998415d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/source-build-reference-packages - 7cdb7a26c89847fcd5dc72ef5eba659030f57666 + e5429803f3e9064da8a857b561a07489800f3f29 From aca24a9b5ad3f7d7dc98d09bda4f4f32858d8d96 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:27:03 -0700 Subject: [PATCH 4/6] [6.0.1xx] Update asp.net template versions (#13543) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3c78b3b55..7f1b5381e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From 753cdcf45f3f141318a9b003a0adab64665bf5e3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Apr 2022 13:30:37 -0700 Subject: [PATCH 5/6] [6.0.2xx] Update asp.net template versions (#13544) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e93ceedc3..2300d2523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.15 + 5.0.16 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.23 + 3.1.24 3.2.1 4.8.0-rc2.19462.10 From 8d32713c4ed6f9e49b5b4cb18bf42ac733aef3f4 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Apr 2022 17:36:01 -0700 Subject: [PATCH 6/6] update global.json and Versions.props for .NET SDK 6.0.104 (#13607) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f1b5381e..b34c1170a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.103 + 6.0.104 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 4947d6f9a..8f624df61 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103" + "dotnet": "6.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",