From cbcd287b054edfa1c72c99b90f9fd65707c73e6b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:50 -0700 Subject: [PATCH 1/4] Update branding to 7.0.106 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 54b14ea3a..ff347c7ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 555a668e452a98d53005eacb696f45024bb11c78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:39:29 -0700 Subject: [PATCH 2/4] [release/7.0.1xx] Update dependencies from dotnet/arcade (#16054) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 23 ----------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 11 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93f5df6c1..90806051e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - @@ -21,17 +16,8 @@ - - - - - - - - - @@ -56,17 +42,8 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b0b7e8a..a9cf6de78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ff347c7ab..1ac5855a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 0be0ea84df9abf43113acda3f9d20bed611262b5 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:06:32 -0700 Subject: [PATCH 3/4] .NET Source-Build 7.0.105 April 2023 Updates (#16049) Co-authored-by: Matt Thalman --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1ac5855a1..f83018707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.104 - 7.0.104 + 7.0.105 + 7.0.105 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 56136778d..88a5f3c55 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104" + "dotnet": "7.0.105" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From ff8565af3b232cf79f3afc0a644d1ba5c61eca63 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:08:55 -0700 Subject: [PATCH 4/4] Merging internal commits for release/7.0.1xx (#16046) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell (.NET) --- NuGet.config | 17 ++++++- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 3 files changed, 95 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 90806051e..907a39c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,25 @@ + + - + + + + + + + @@ -39,11 +47,18 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9cf6de78..91a0017d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + f75d9496cbb2fe61cfdb1299520c5c34a062a898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 2eac9157adc012e2956c7c5f33c15aeb0cfe7d6a + 7e646be438ea3fdd8fdab0553cd0e5b505174b65 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index f83018707..7abd74ea4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23175.1 - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23176.1 @@ -56,46 +56,46 @@ - 7.0.4 - 7.0.4 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 + 7.0.5 + 7.0.5 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 0.2.0 - 7.0.104 - 7.0.104-servicing.23127.12 - 7.0.104-servicing.23127.12 + 7.0.105 + 7.0.105-servicing.23177.17 + 7.0.105-servicing.23177.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.1 + 7.0.2 - 7.0.4-servicing.23115.8 - 7.0.4-servicing.23115.8 - 7.0.4 - 7.0.4 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23174.5 + 7.0.5-servicing.23174.5 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23177.5 + 7.0.5-servicing.23177.5 + 7.0.5 + 7.0.5 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.4 - 7.0.4 + 7.0.5 + 7.0.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)