From b5fbd1b9bf0f76bacd299241af8e5f72014d874d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 13 Sep 2023 11:57:52 -0400 Subject: [PATCH 01/60] [release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) --- .../tarball/content/Directory.Build.props | 5 +---- .../tarball/content/repos/aspnetcore.proj | 1 + src/SourceBuild/tarball/content/repos/installer.proj | 2 +- .../tarball/content/tools-local/init-build.proj | 12 ++++++++++++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 3 +++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 797e54fa6..c4902c251 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -181,6 +181,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) @@ -230,12 +231,8 @@ - - - - diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 480f3c713..4a589ea41 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -7,6 +7,7 @@ $(BuildCommandArgs) --arch $(Platform) $(BuildCommandArgs) --no-build-repo-tasks + $(BuildCommandArgs) --os-name linux-musl $(BuildCommandArgs) /p:BuildNodeJs=false $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index b2c3beed1..81f5e5b6a 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + + + + + + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 8949af132..a59ed388f 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -6,7 +6,7 @@ microsoft.netcore.app.runtime.$(SharedFrameworkRid) - microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture) + microsoft.netcore.app.crossgen2.$(Crossgen2Rid) $(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 88a053b61..ce5e09b69 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -84,6 +84,9 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(HostOSName)-$(BuildArchitecture) + $(SharedFrameworkRid) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreInstallerRid) From 04d2e433c900d88b9a76b0f3fbd01656c4ba79d2 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 15 Sep 2023 08:52:47 -0500 Subject: [PATCH 02/60] .NET Source-Build 6.0.122 September 2023 Updates (#17340) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MissingXmlDoc.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 08cf8283c..d3d273fe2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,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.121 + 6.0.122 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index e981a599e..c832b0941 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121" + "dotnet": "6.0.122" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 03c33a186a1ff4982c846da5c3959661227e07dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:05:59 +0000 Subject: [PATCH 03/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.415-servicing.23477.35 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++----------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5..99b3e6dd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - + - - - - - - @@ -46,21 +38,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c3d54c5e..f67f720d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 diff --git a/eng/Versions.props b/eng/Versions.props index 583c355f0..5040b1d4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From 76098239700644026ba4f70272223dca59719c1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:19 +0000 Subject: [PATCH 04/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.318-servicing.23477.33 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..8203ce00b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,17 @@ - - + - - @@ -41,15 +38,12 @@ - - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62db8623a..c1eb9571d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 diff --git a/eng/Versions.props b/eng/Versions.props index e74a2d23f..68eec28c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From fc219bcc8f778c242cc7bf08346c0369cc142467 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:37 +0000 Subject: [PATCH 05/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.34 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 23 ++------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 3 files changed, 35 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..2802cd154 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,17 @@ - - - - - - + - - - - - - @@ -49,22 +38,14 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..c9b3a6fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 3535ea913..a4cf0a1c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 230219d45946a0ab2e8038801bc3299968d1bd0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 01:37:12 +0000 Subject: [PATCH 06/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.40 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2802cd154..cb4afa3ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9b3a6fd2..899fdace3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 diff --git a/eng/Versions.props b/eng/Versions.props index a4cf0a1c1..f53dfa3b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.121 + 6.0.123 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.34 - 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ea2c912efe125c9e0f090f9121f50793e6faa2b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 03:08:14 +0000 Subject: [PATCH 07/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.51 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb4afa3ff..6cb6d58e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 899fdace3..cb689fa1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f53dfa3b1..252ee35c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.40 - 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 From d1482ceb6b1a72fd3fd1f86e1ae0e117b977d786 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 06:03:21 +0000 Subject: [PATCH 08/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.58 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.58 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cb6d58e1..119de589a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -40,6 +41,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb689fa1b..1cab14032 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 diff --git a/eng/Versions.props b/eng/Versions.props index 252ee35c5..4f5253f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 0.2.0 - 6.0.123-servicing.23477.51 - 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.58 + 6.0.123-servicing.23477.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f817683aea089c4f30bc317435e8f2e9ee699655 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:45:51 +0000 Subject: [PATCH 09/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23478.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 119de589a..b4009a88d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cab14032..6c544b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 diff --git a/eng/Versions.props b/eng/Versions.props index 4f5253f90..0249e1e83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 - 6.0.123-servicing.23477.58 - 6.0.123-servicing.23477.58 + 6.0.123-servicing.23478.12 + 6.0.123-servicing.23478.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 045b8d39b99c1b2de45f9e051158d3d6632dfb76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:54:23 +0000 Subject: [PATCH 10/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++------------------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc601a50..0b04034b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,9 @@ - - - - + - - - - @@ -24,12 +17,9 @@ + - - - - @@ -51,19 +41,13 @@ - - - - + + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f0b6154..6b1a9f1e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 diff --git a/eng/Versions.props b/eng/Versions.props index c64853195..294b3043c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.110 - 7.0.110-servicing.23367.22 - 7.0.110-servicing.23367.22 + 7.0.112 + 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22dd334fe1c5aee46acec0c75c606f21a73a8ac6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:48 +0000 Subject: [PATCH 11/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.33 -> To Version 6.0.318-servicing.23477.41 --- 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 c1eb9571d..5ede60723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae diff --git a/eng/Versions.props b/eng/Versions.props index 68eec28c9..bb3592c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.33 - 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48ec5bfab962997cee4fbaf6ae41d1950c56e0fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:57 +0000 Subject: [PATCH 12/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.41 -> To Version 6.0.318-servicing.23477.53 --- 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 5ede60723..510204ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 diff --git a/eng/Versions.props b/eng/Versions.props index bb3592c89..c433b43a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.41 - 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1be7383da96fa85394061f5fb7915ea896dfa567 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:05 +0000 Subject: [PATCH 13/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.53 -> To Version 6.0.318-servicing.23477.57 --- 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 510204ec6..cf878fa54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 diff --git a/eng/Versions.props b/eng/Versions.props index c433b43a2..ccdad7c14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.53 - 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.57 + 6.0.318-servicing.23477.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f079309f9336248845ca2bfdfa65910cff1a2a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:12 +0000 Subject: [PATCH 14/60] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8203ce00b..8855eb812 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,12 +41,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf878fa54..b91e3ccdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ccdad7c14..af7e134fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.316 + 6.0.318 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From d1579c4f20e5f83e8a5a61dbd08b958a8ac7a0d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:19 +0000 Subject: [PATCH 15/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.35 -> To Version 6.0.415-servicing.23477.42 --- 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 f67f720d0..4b55484dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 diff --git a/eng/Versions.props b/eng/Versions.props index 5040b1d4c..2c7878bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.35 - 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ca72019f042f532536608a27e9e558a30122eba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:27 +0000 Subject: [PATCH 16/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.42 -> To Version 6.0.415-servicing.23477.52 --- 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 4b55484dc..8ca09bc8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 diff --git a/eng/Versions.props b/eng/Versions.props index 2c7878bd4..49d76812f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.42 - 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2191d456f60e9afb47945a2fa2b4acbc27824a8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:34 +0000 Subject: [PATCH 17/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.52 -> To Version 6.0.415-servicing.23477.56 --- 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 8ca09bc8a..f82d016f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 diff --git a/eng/Versions.props b/eng/Versions.props index 49d76812f..dca8bdc9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.52 - 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.56 + 6.0.415-servicing.23477.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b8c178115a1afda0a1a364792751987fcc14c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:42 +0000 Subject: [PATCH 18/60] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99b3e6dd7..b92191712 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,13 +41,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f82d016f4..f7baaa280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dca8bdc9e..ed174f841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.413 + 6.0.415 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 53f9a61939f037c237050b290cb9a1f2ccb8a672 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:15:36 +0000 Subject: [PATCH 19/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b04034b8..3aa2e78a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b1a9f1e3..a6443618c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 294b3043c..1427dc9b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.7 - 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.18 + 7.0.112-servicing.23478.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,12 +82,12 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From fdd48b76205bfc945d802ba28375b9a17aa83414 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 28 Sep 2023 23:44:07 +0000 Subject: [PATCH 20/60] Merged PR 34026: Update SB SDK and XML diff baselines --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 22 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4e98d267b..71ae3f0b9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -348,13 +331,13 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/ ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll @@ -431,9 +414,10 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/System.Security.Permissions.dll From f2a621680aed301a573fbf9e64d2168a74ddf530 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:24:54 +0000 Subject: [PATCH 21/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa2e78a3..595c01e4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6443618c..f8bb0ad9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1427dc9b7..d1fff5345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.18 - 7.0.112-servicing.23478.18 + 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From 99b0a4d95f9bb80a0c3f540f35c8df4814e97660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 01:55:02 +0000 Subject: [PATCH 22/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23478.12 -> To Version 6.0.123-servicing.23479.29 Dependency coherency updates VS.Redist.Common.NetCore.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.23-servicing.23475.15 -> To Version 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4009a88d..84e9b6596 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,25 @@ + + - + + + + + @@ -41,16 +47,22 @@ + + - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c544b0bd..932a156bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,7 +17,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ac9d0f6242b48fca7e36d519cde33210a798adec - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d diff --git a/eng/Versions.props b/eng/Versions.props index 0249e1e83..179012d2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23478.12 - 6.0.123-servicing.23478.12 + 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 From 9415960d4eded05d2f69e0cb9e4c5fc8d3613c1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:01 +0000 Subject: [PATCH 23/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.29 -> To Version 6.0.123-servicing.23479.39 --- 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 932a156bf..65e097e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 diff --git a/eng/Versions.props b/eng/Versions.props index 179012d2c..5c5e6319d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.29 - 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cae700fe1319db9592763c037ec3ec6995125b7c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:07 +0000 Subject: [PATCH 24/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.66 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 595c01e4a..ef9fc45aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,12 +16,16 @@ + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8bb0ad9e..f417e14d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da diff --git a/eng/Versions.props b/eng/Versions.props index d1fff5345..3554f410a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.5 - 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.66 + 7.0.112-servicing.23479.66 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8ba6e005be7e3493b89a58f48b8f6046920a79b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:09 +0000 Subject: [PATCH 25/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.39 -> To Version 6.0.123-servicing.23479.48 --- 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 65e097e19..b925ef454 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 diff --git a/eng/Versions.props b/eng/Versions.props index 5c5e6319d..70dbaf233 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.39 - 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b05af8774825a123a4e563127e0565afddd1869 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:18 +0000 Subject: [PATCH 26/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.48 -> To Version 6.0.123-servicing.23479.57 --- 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 b925ef454..e29d794dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec diff --git a/eng/Versions.props b/eng/Versions.props index 70dbaf233..8450188f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.48 - 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 855b6b5d0910fd8330f2667f3970cbb538edaecc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:25 +0000 Subject: [PATCH 27/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.71 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.57 -> To Version 6.0.123-servicing.23479.71 --- 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 e29d794dd..ceb77a7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 diff --git a/eng/Versions.props b/eng/Versions.props index 8450188f6..0343bc766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.57 - 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.71 + 6.0.123-servicing.23479.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a33e75529cd5abaf13d579c64c68aa6dcb4ac31 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:34 +0000 Subject: [PATCH 28/60] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++++--------------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e9b6596..e4ad17f61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,14 +17,10 @@ - - - + - - - + @@ -47,23 +41,17 @@ - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceb77a7a4..8fe2fb57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://github.com/dotnet/runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0343bc766..a00c3d73e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,10 +46,10 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From a15f83f24a4b485de776e9564075d6fe7cad1b9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:03:51 +0000 Subject: [PATCH 29/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.57 -> To Version 6.0.318-servicing.23479.69 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8855eb812..64a1657f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b91e3ccdb..d79f3bb69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index af7e134fa..f65377789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.318-servicing.23477.57 - 6.0.318-servicing.23477.57 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From 7e2be1f5074f3df4b492d2f08181a23d041b4c68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:04:00 +0000 Subject: [PATCH 30/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.56 -> To Version 6.0.415-servicing.23479.70 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index b92191712..a14489bf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7baaa280..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed174f841..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.415-servicing.23477.56 - 6.0.415-servicing.23477.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From dffc87a32c4cb34338e5eff2e05ef1f6ef26df36 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:03 +0000 Subject: [PATCH 31/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.70 -> To Version 6.0.415-servicing.23479.30 --- 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 2c06860d8..c727f2dcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..94567f8c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 187b820af2fb72e8fc52a6c08fe47ae2b9896f60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:04 +0000 Subject: [PATCH 32/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.69 -> To Version 6.0.318-servicing.23479.28 --- 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 d79f3bb69..bfde77346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e diff --git a/eng/Versions.props b/eng/Versions.props index f65377789..167a78ad8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76985f56fb3dba1609c07f38a96da85069959957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:10 +0000 Subject: [PATCH 33/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.30 -> To Version 6.0.415-servicing.23479.40 --- 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 c727f2dcc..9e254f0b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 diff --git a/eng/Versions.props b/eng/Versions.props index 94567f8c9..f8f42a414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.30 - 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae70e87b345305f93583de3ce2aa60ddc9a84c3c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:11 +0000 Subject: [PATCH 34/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.28 -> To Version 6.0.318-servicing.23479.38 --- 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 bfde77346..cf99c5938 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 diff --git a/eng/Versions.props b/eng/Versions.props index 167a78ad8..3892fbbd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.28 - 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68ad03f61c60c15f139226c4aae0119b7d35e60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:17 +0000 Subject: [PATCH 35/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.40 -> To Version 6.0.415-servicing.23479.47 --- 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 9e254f0b3..aa6ea5906 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee diff --git a/eng/Versions.props b/eng/Versions.props index f8f42a414..c56f8747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.40 - 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 364dc4c268098f6b1756acb9d252fc05ef8ea4d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:19 +0000 Subject: [PATCH 36/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.38 -> To Version 6.0.318-servicing.23479.46 --- 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 cf99c5938..12f20cd4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 diff --git a/eng/Versions.props b/eng/Versions.props index 3892fbbd0..d73c574b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.38 - 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68bd681d7c03f3c7c61c66ebc18bb4c8539d11d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:24 +0000 Subject: [PATCH 37/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.47 -> To Version 6.0.415-servicing.23479.56 --- 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 aa6ea5906..dc6793b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c diff --git a/eng/Versions.props b/eng/Versions.props index c56f8747d..6e00936c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.47 - 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27d1988d9b494a43620f4e3b6b9d6f33fe249a26 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:27 +0000 Subject: [PATCH 38/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.46 -> To Version 6.0.318-servicing.23479.55 --- 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 12f20cd4a..6dc7d39e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff diff --git a/eng/Versions.props b/eng/Versions.props index d73c574b7..932a00ae5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.46 - 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93ea239eefc0c499f3e92060ac88bbb121df4ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:31 +0000 Subject: [PATCH 39/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.56 -> To Version 6.0.415-servicing.23479.70 --- 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 dc6793b95..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a diff --git a/eng/Versions.props b/eng/Versions.props index 6e00936c8..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.56 - 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 00e0950ae1b407ea194fafc0b76266e0df3d2f78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:35 +0000 Subject: [PATCH 40/60] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.55 -> To Version 6.0.318-servicing.23479.69 --- 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 6dc7d39e9..d79f3bb69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 diff --git a/eng/Versions.props b/eng/Versions.props index 932a00ae5..f65377789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.55 - 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24086fb71dd39bd42ddee1f3c05499774999398e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:56:48 +0000 Subject: [PATCH 41/60] Merged PR 34148: [internal/release/frameshift/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.123-servicing.23479.10 to 6.0.123-servicing.23480.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) ... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4ad17f61..49478e17d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fe2fb57d..06ce9eb12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a00c3d73e..24277c346 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.123-servicing.23479.71 - 6.0.123-servicing.23479.71 + 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 462a63808716c6525ede956568cdd8df6d25f575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:58:22 +0000 Subject: [PATCH 42/60] Merged PR 34149: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.415-rtm.23479.11 to 6.0.415-rtm.23480.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index a14489bf7..23ad3ebc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c06860d8..e4e428567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..fae520d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From df92e2d472598c60ecd99f7094f3ee05012a66bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 18:06:47 +0000 Subject: [PATCH 43/60] Merged PR 34152: [internal/release/frameshift/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.318-servicing.23479.12 to 6.0.318-servicing.23480.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64a1657f1..c8e5ee130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d79f3bb69..f0ac19843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f65377789..053fce3fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 6963d2d1e0eb7c42b773f62b1d34fe34a7182d17 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:18 +0000 Subject: [PATCH 44/60] Merged PR 34160: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:972ce726-6675-4ba6-cadf-08dbbf3cebf2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 972ce726-6675-4ba6-cadf-08dbbf3cebf2 - **Build**: 20230930.38 - **Date Produced**: October 1, 2023 1:52:12 AM UTC - **Commit**: bb5ae4829da51d315033bedb73116477b0390cd3 - **Branch**: refs/heads/internal/release/frameshift/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] - **Microsoft.NET.Sdk**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfe3cff583e&targetVersion=GCbb5ae4829d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:972ce726-6675-4ba6-cadf-08dbbf3cebf2) --- 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 e4e428567..05566786f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 diff --git a/eng/Versions.props b/eng/Versions.props index fae520d6b..ef5eb1b77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.28 - 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.38 + 6.0.415-servicing.23480.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcbed60f06e45836728bb36dbb2ddfc52572b787 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:28 +0000 Subject: [PATCH 45/60] Merged PR 34162: [internal/release/frameshift/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230930.39 - **Date Produced**: October 1, 2023 1:52:26 AM UTC - **Commit**: 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC080adee382&targetVersion=GC40c58ac25e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774) --- 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 f0ac19843..0c2c995c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 diff --git a/eng/Versions.props b/eng/Versions.props index 053fce3fc..90e7220b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.29 - 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.39 + 6.0.318-servicing.23480.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a33389fcc17c512c4ce21b1cf88863aa55e7307a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:47 +0000 Subject: [PATCH 46/60] Merged PR 34161: [internal/release/frameshift/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:c1ce247f-982c-4c66-45be-08dbbf92e44a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: c1ce247f-982c-4c66-45be-08dbbf92e44a - **Build**: 20230930.40 - **Date Produced**: October 1, 2023 1:52:22 AM UTC - **Commit**: 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - **Branch**: refs/heads/internal/release/frameshift/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] - **Microsoft.NET.Sdk**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1194051db6&targetVersion=GC6fe8d6cc28&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:c1ce247f-982c-4c66-45be-08dbbf92e44a) --- 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 06ce9eb12..b04700e60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 diff --git a/eng/Versions.props b/eng/Versions.props index 24277c346..2eb7a5b93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23480.27 - 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.40 + 6.0.123-servicing.23480.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c97215789531577c81c203f54f4b03ca92ab771a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:23:03 +0000 Subject: [PATCH 47/60] Merged PR 34163: [internal/release/frameshift/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 80a7d8ee-cef6-47d1-9179-08dbbf3a441d - **Build**: 20230930.37 - **Date Produced**: October 1, 2023 2:01:44 AM UTC - **Commit**: 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - **Branch**: refs/heads/internal/release/frameshift/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.112 to 7.0.112][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.NET.Sdk**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f60c1c695&targetVersion=GC152e97ccf0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef9fc45aa..91f4d8984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -16,14 +18,18 @@ + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f417e14d7..5131222e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 diff --git a/eng/Versions.props b/eng/Versions.props index 3554f410a..e45ca64c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.66 - 7.0.112-servicing.23479.66 + 7.0.112-servicing.23480.37 + 7.0.112-servicing.23480.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8db2da707c21f242d1a6c5a2bcc331f152828c9d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:35 -0700 Subject: [PATCH 48/60] Update branding to 6.0.124 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3d273fe2..476cea82c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 23 + 24 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8bc78a3797571a573b60b68394441ae5b5d49ed6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:39 -0700 Subject: [PATCH 49/60] Update branding to 6.0.319 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668..c3fbc4677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 0099fd01897eee2c6be5a0c41c8a8e9409bca0db Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 10 Oct 2023 18:51:41 -0700 Subject: [PATCH 50/60] .NET Source-Build 6.0.123 October 2023 Updates (#17494) --- 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 bdb786486..c3c5ea3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,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.122 + 6.0.123 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c832b0941..20e7bdc4c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.122" + "dotnet": "6.0.123" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 0aae0479bebaebd53e3fbdc6e7e82d335ae2255d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 15:13:23 +0000 Subject: [PATCH 51/60] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23408.3 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++---------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91f4d8984..41be8fc16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -17,17 +14,18 @@ - - - - - + + + + + + @@ -53,17 +51,12 @@ - - - - - - - - + + + @@ -71,6 +64,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5131222e8..d5c344a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ced3fc748..8a3ac9bd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index bf1732f08..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } From f756140b8eee50f121c7bf0644a5bc749c690c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:25:14 +0000 Subject: [PATCH 52/60] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17516) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 20 ++++++++- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 6 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index 23ad3ebc8..9401b3f64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,21 @@ + + + + + + + + + @@ -41,15 +49,23 @@ - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05566786f..688060474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4ece0e92..fac630493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23511.8 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 327cfe027..eeff7fa00 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" } } From 000f90895857c434eb1be181d0eb6eb68da3f322 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:21:26 -0700 Subject: [PATCH 53/60] Update Windows SDK Projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From a7e0e0daac5311c134955e8205d31f7b37079b0b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:24:02 -0700 Subject: [PATCH 54/60] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 5b5d340010ffee9d33d876d4315ab0b59177a0f7 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:25:03 -0700 Subject: [PATCH 55/60] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 3f50f78ff762da7e376331733bcc5c3a2df2f9fa Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:26:23 -0700 Subject: [PATCH 56/60] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 3b8e5ee01323f3d60c486e523d68f56a04304932 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:08 -0700 Subject: [PATCH 57/60] Update branding to 6.0.320 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe..709738fc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 40538ec51933b0f2c89113aab1f8a1440f6f2262 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:13 -0700 Subject: [PATCH 58/60] Update branding to 6.0.417 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d6f2ec0e6..dc111971f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d9ec7ce28aa4d57f1d68646bd67dcb54f3cc98d4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:18 -0700 Subject: [PATCH 59/60] Update branding to 7.0.114 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a3ac9bd0..db0d3d0f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From ce6e592f2df738c3d79f3360768ddccfb956fad7 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 12:37:19 -0500 Subject: [PATCH 60/60] Disable source build xml doc test (#17579) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index 00c0c2b79..f8f4f2c8b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -18,7 +18,8 @@ public class XmlDocTests : SmokeTests /// Verifies every targeting pack assembly has a xml doc file. /// There are exceptions which are specified in baselines/XmlDocIgnore.*.txt. /// - [Fact] + // Re-enable when fixing https://github.com/dotnet/source-build/issues/3660 + //[Fact] public void VerifyTargetingPacksHaveDoc() { List missingXmlDoc = new();