From 154046ab35e31bdc9115a5c4e05d2c179a6407aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Thu, 13 Mar 2025 16:38:40 +0000 Subject: [PATCH 01/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250312.16 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.14 -> To Version 8.0.15 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 13 +++-------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b5916a52142..28f77284f075 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,7 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-format --> <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" /> @@ -30,13 +28,10 @@ <!-- Begin: Package sources from dotnet-roslyn-analyzers --> <!-- End: Package sources from dotnet-roslyn-analyzers --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-6eee28c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6eee28c2/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-templating-0da2c6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0da2c6ec/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" /> @@ -83,9 +78,7 @@ <!-- End: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-1584e49-1" value="true" /> - <add key="darc-int-dotnet-runtime-1584e49-2" value="true" /> - <add key="darc-int-dotnet-runtime-1584e49" value="true" /> + <add key="darc-int-dotnet-runtime-6eee28c" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89024ffdf808..f63fc060c14f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.18"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25162.16"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> <SourceBuild RepoName="runtime" ManagedOnly="false" /> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.14-servicing.25111.18"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25162.16"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.14"> + <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.14-servicing.25111.18"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25162.16"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="Microsoft.NET.HostModel" Version="8.0.14-servicing.25111.18"> + <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25162.16"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.14"> + <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.14" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.15" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha> + <Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha> </Dependency> <Dependency Name="Microsoft.Build" Version="17.8.22"> <Uri>https://github.com/dotnet/msbuild</Uri> @@ -200,21 +200,21 @@ <Uri>https://github.com/microsoft/vstest</Uri> <Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha> </Dependency> - <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.14"> + <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> <Dependency Name="System.Formats.Asn1" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> <Dependency Name="System.CodeDom" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> </Dependency> - <Dependency Name="System.Diagnostics.EventLog" Version="8.0.1"> + <Dependency Name="System.Diagnostics.EventLog" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -408,7 +408,7 @@ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha> + <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> </Dependency> <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1"> diff --git a/eng/Versions.props b/eng/Versions.props index ed810ee22224..2658855ac810 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/runtime --> - <MicrosoftNETCoreAppRefPackageVersion>8.0.14</MicrosoftNETCoreAppRefPackageVersion> - <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.18</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>8.0.15</MicrosoftNETCoreAppRefPackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25162.16</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion> - <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.14</MicrosoftNETCoreDotNetHostResolverPackageVersion> - <MicrosoftNETHostModelVersion>8.0.14-servicing.25111.18</MicrosoftNETHostModelVersion> + <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.15</MicrosoftNETCoreDotNetHostResolverPackageVersion> + <MicrosoftNETHostModelVersion>8.0.15-servicing.25162.16</MicrosoftNETHostModelVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion> <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion> <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion> - <MicrosoftNETILLinkTasksPackageVersion>8.0.14</MicrosoftNETILLinkTasksPackageVersion> + <MicrosoftNETILLinkTasksPackageVersion>8.0.15</MicrosoftNETILLinkTasksPackageVersion> <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion> <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> <MicrosoftExtensionsObjectPoolPackageVersion>8.0.14</MicrosoftExtensionsObjectPoolPackageVersion> @@ -70,7 +70,7 @@ <SystemCompositionHostingPackageVersion>8.0.0</SystemCompositionHostingPackageVersion> <SystemCompositionRuntimePackageVersion>8.0.0</SystemCompositionRuntimePackageVersion> <SystemCompositionTypedPartsPackageVersion>8.0.0</SystemCompositionTypedPartsPackageVersion> - <SystemDiagnosticsEventLogPackageVersion>8.0.1</SystemDiagnosticsEventLogPackageVersion> + <SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion> <SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion> <SystemDrawingCommonPackageVersion>8.0.0</SystemDrawingCommonPackageVersion> <SystemSecurityCryptographyPkcsPackageVersion>8.0.1</SystemSecurityCryptographyPkcsPackageVersion> @@ -225,7 +225,7 @@ </PropertyGroup> <PropertyGroup> <!-- Workloads from dotnet/emsdk --> - <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.14</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion> + <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.15</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion> <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion> <!-- emsdk workload prerelease version band must match the emsdk feature band --> <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand> From f7ef9199d0dceceadf2ab48e4e06cc373720ca90 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 14 Mar 2025 17:50:46 +0000 Subject: [PATCH 02/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250314.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.14 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.14-servicing.25113.2 -> To Version 8.0.15-servicing.25163.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 8 ++------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28f77284f075..ec056cd8274a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -34,9 +34,7 @@ <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f53fd07b/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -81,9 +79,7 @@ <add key="darc-int-dotnet-runtime-6eee28c" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63fc060c14f..bbb80bdfd8d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,25 +228,25 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.14"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha> + <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25113.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha> + <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.14"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha> + <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25113.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha> + <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25113.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25163.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha> + <Sha>b96de9c3900a80c97119788a4bde7c34dd5ebac0</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 2658855ac810..b5313c12ae6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25113.2</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25163.3</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From ecda903268db779692601833f971ff761ec3ab3d Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 14 Mar 2025 23:06:49 +0000 Subject: [PATCH 03/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.9 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec056cd8274a..3e5526344e19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ <!-- Begin: Package sources from dotnet-roslyn-analyzers --> <!-- End: Package sources from dotnet-roslyn-analyzers --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-6eee28c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6eee28c2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-f64f435" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f64f4350/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> @@ -76,7 +76,7 @@ <!-- End: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-6eee28c" value="true" /> + <add key="darc-int-dotnet-runtime-f64f435" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbb80bdfd8d4..cec3e8eb8e09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25162.16"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> <SourceBuild RepoName="runtime" ManagedOnly="false" /> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25162.16"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25162.16"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> - <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25162.16"> + <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25164.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -49,7 +49,7 @@ </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.15" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Uri>https://github.com/dotnet/emsdk</Uri> @@ -202,11 +202,11 @@ </Dependency> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="System.Formats.Asn1" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="System.CodeDom" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -214,7 +214,7 @@ </Dependency> <Dependency Name="System.Diagnostics.EventLog" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -408,7 +408,7 @@ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>6eee28c27213784c1f8a112df1c90113585c4111</Sha> + <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> </Dependency> <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1"> diff --git a/eng/Versions.props b/eng/Versions.props index b5313c12ae6d..ebdca2c9a62c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,12 +50,12 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/runtime --> <MicrosoftNETCoreAppRefPackageVersion>8.0.15</MicrosoftNETCoreAppRefPackageVersion> - <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25162.16</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.15</MicrosoftNETCoreDotNetHostResolverPackageVersion> - <MicrosoftNETHostModelVersion>8.0.15-servicing.25162.16</MicrosoftNETHostModelVersion> + <MicrosoftNETHostModelVersion>8.0.15-servicing.25164.9</MicrosoftNETHostModelVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion> <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion> From 8d657dcbe3eebea136c5b07f87b52b815735fdae Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Sat, 15 Mar 2025 07:25:35 +0000 Subject: [PATCH 04/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.13 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e5526344e19..4873904e0af4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ <!-- Begin: Package sources from dotnet-roslyn-analyzers --> <!-- End: Package sources from dotnet-roslyn-analyzers --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-f64f435" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f64f4350/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> @@ -76,7 +76,7 @@ <!-- End: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-f64f435" value="true" /> + <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cec3e8eb8e09..c7f09ee2e64b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.9"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> <SourceBuild RepoName="runtime" ManagedOnly="false" /> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.9"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.13"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.9"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.13"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> - <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25164.9"> + <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25164.13"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -49,7 +49,7 @@ </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.15" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Uri>https://github.com/dotnet/emsdk</Uri> @@ -202,11 +202,11 @@ </Dependency> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="System.Formats.Asn1" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="System.CodeDom" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -214,7 +214,7 @@ </Dependency> <Dependency Name="System.Diagnostics.EventLog" Version="8.0.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -408,7 +408,7 @@ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>f64f43502df9ae0b087be92136fa2242091b3145</Sha> + <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha> </Dependency> <!-- Dependency required for flowing correct package version in source-build, using PVP flow. --> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1"> diff --git a/eng/Versions.props b/eng/Versions.props index ebdca2c9a62c..1240d34475e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,12 +50,12 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/runtime --> <MicrosoftNETCoreAppRefPackageVersion>8.0.15</MicrosoftNETCoreAppRefPackageVersion> - <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.15</MicrosoftNETCoreDotNetHostResolverPackageVersion> - <MicrosoftNETHostModelVersion>8.0.15-servicing.25164.9</MicrosoftNETHostModelVersion> + <MicrosoftNETHostModelVersion>8.0.15-servicing.25164.13</MicrosoftNETHostModelVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion> <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion> From 9ed9b0543622f83d692ea2f84ea0de8da8fdd4c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Sat, 15 Mar 2025 19:21:02 +0000 Subject: [PATCH 05/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250315.2 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.14-servicing.25112.21 -> To Version 8.0.15-servicing.25165.2 --- NuGet.config | 8 ++--- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4873904e0af4..22c0dd9dee68 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,9 +18,7 @@ <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-format --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-d6c6665" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d6c6665f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" /> @@ -59,9 +57,7 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" /> - <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" /> - <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" /> + <add key="darc-int-dotnet-aspnetcore-d6c6665" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-format --> <add key="darc-int-dotnet-format-27f1865-1" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7f09ee2e64b..f4ec7ca45a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ <Uri>https://github.com/dotnet/roslyn</Uri> <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.14"> + <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.8.1-rc.2"> <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri> @@ -248,50 +248,50 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Sha>b96de9c3900a80c97119788a4bde7c34dd5ebac0</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14"> + <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.14"> + <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.21"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="8.0.14-servicing.25112.21"> + <Dependency Name="dotnet-dev-certs" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="8.0.14-servicing.25112.21"> + <Dependency Name="dotnet-user-jwts" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="8.0.14-servicing.25112.21"> + <Dependency Name="dotnet-user-secrets" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.14-servicing.25112.21"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.15-servicing.25165.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.5"> <Uri>https://github.com/dotnet/razor</Uri> @@ -306,21 +306,21 @@ <Uri>https://github.com/dotnet/razor</Uri> <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.14"> + <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.14"> + <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.14"> + <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> - <Dependency Name="Microsoft.JSInterop" Version="8.0.14"> + <Dependency Name="Microsoft.JSInterop" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true"> <Uri>https://github.com/dotnet/xdt</Uri> @@ -437,9 +437,9 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.14"> + <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha> + <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> </Dependency> <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 1240d34475e3..661e74ffc00a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ <MicrosoftNETILLinkTasksPackageVersion>8.0.15</MicrosoftNETILLinkTasksPackageVersion> <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion> <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> - <MicrosoftExtensionsObjectPoolPackageVersion>8.0.14</MicrosoftExtensionsObjectPoolPackageVersion> + <MicrosoftExtensionsObjectPoolPackageVersion>8.0.15</MicrosoftExtensionsObjectPoolPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion> <SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion> <SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion> @@ -165,13 +165,13 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> - <MicrosoftAspNetCoreAppRefPackageVersion>8.0.14</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> - <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion> - <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreMvcAnalyzersPackageVersion> - <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion> - <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreAnalyzersPackageVersion> - <MicrosoftAspNetCoreTestHostPackageVersion>8.0.14</MicrosoftAspNetCoreTestHostPackageVersion> + <MicrosoftAspNetCoreAppRefPackageVersion>8.0.15</MicrosoftAspNetCoreAppRefPackageVersion> + <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> + <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion> + <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion> + <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion> + <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreAnalyzersPackageVersion> + <MicrosoftAspNetCoreTestHostPackageVersion>8.0.15</MicrosoftAspNetCoreTestHostPackageVersion> </PropertyGroup> <!-- Dependencies from https://github.com/dotnet/razor --> <PropertyGroup> From bc7c46c119b87e75c22e9a693584d86c919c505e Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Sun, 16 Mar 2025 01:53:43 +0000 Subject: [PATCH 06/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250315.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25165.5 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22c0dd9dee68..afa7e5bb72c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-format --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-d6c6665" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d6c6665f/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" /> @@ -57,7 +57,7 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-d6c6665" value="true" /> + <add key="darc-int-dotnet-aspnetcore-8899cb3" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-format --> <add key="darc-int-dotnet-format-27f1865-1" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4ec7ca45a76..8a8826390e88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ <Uri>https://github.com/dotnet/roslyn</Uri> <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.8.1-rc.2"> <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri> @@ -250,48 +250,48 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25165.2"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="8.0.15-servicing.25165.2"> + <Dependency Name="dotnet-dev-certs" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="dotnet-user-jwts" Version="8.0.15-servicing.25165.2"> + <Dependency Name="dotnet-user-jwts" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="8.0.15-servicing.25165.2"> + <Dependency Name="dotnet-user-secrets" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.15-servicing.25165.2"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.15-servicing.25165.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.5"> <Uri>https://github.com/dotnet/razor</Uri> @@ -308,19 +308,19 @@ </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.JSInterop" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true"> <Uri>https://github.com/dotnet/xdt</Uri> @@ -439,7 +439,7 @@ </Dependency> <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>d6c6665f772165b3ac034420397184dabf993fdc</Sha> + <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 661e74ffc00a..9f41d631620a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,11 +166,11 @@ <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRefPackageVersion>8.0.15</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> - <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion> - <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion> - <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion> - <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.15-servicing.25165.2</MicrosoftAspNetCoreAnalyzersPackageVersion> + <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> + <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion> + <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion> + <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion> + <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreAnalyzersPackageVersion> <MicrosoftAspNetCoreTestHostPackageVersion>8.0.15</MicrosoftAspNetCoreTestHostPackageVersion> </PropertyGroup> <!-- Dependencies from https://github.com/dotnet/razor --> From 1d6d09efc97c47db05f79e01b5a373eb5cd5b923 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Sun, 16 Mar 2025 19:19:52 +0000 Subject: [PATCH 07/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250316.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25163.3 -> To Version 8.0.15-servicing.25165.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index afa7e5bb72c3..1ffece49243e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,7 +32,7 @@ <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f53fd07b/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-2705463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27054635/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -75,7 +75,7 @@ <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-f53fd07" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-2705463" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a8826390e88..d170f7550997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> + <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25166.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> + <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> + <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25166.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3</Sha> + <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25163.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25165.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>b96de9c3900a80c97119788a4bde7c34dd5ebac0</Sha> + <Sha>9d1a7bbd03007c329391026b1abf1ca404b3b90d</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 9f41d631620a..6f8f27633a9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25163.3</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25165.2</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 934c5fc44a6477c35db1bdbd2537609f6ad91d1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Mon, 17 Mar 2025 19:52:10 +0000 Subject: [PATCH 08/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250317.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25167.5 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ffece49243e..5fac2e53cd4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,7 +32,7 @@ <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-2705463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27054635/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-d4f37f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d4f37f88/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -75,7 +75,7 @@ <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-2705463" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-d4f37f8" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d170f7550997..f5432fcd4b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> + <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25166.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25167.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> + <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> + <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25166.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25167.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>2705463579d6d3d8436301f02213ce4987669c80</Sha> + <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25165.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>9d1a7bbd03007c329391026b1abf1ca404b3b90d</Sha> + <Sha>b929fc7b324b21fe74f2d1d4fe52b534046152b0</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 6f8f27633a9b..f05b9969a926 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25165.2</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25167.5</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 8c07b8eca6444969f6aeeebe2fbfc8938adfd7f9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 18 Mar 2025 17:56:25 +0000 Subject: [PATCH 09/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250318.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25167.9 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5fac2e53cd4d..58a1eae20c56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,7 +32,7 @@ <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-d4f37f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d4f37f88/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -75,7 +75,7 @@ <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-d4f37f8" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-83fc500" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5432fcd4b42..53be1fff17ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> + <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25167.2"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25168.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> + <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> + <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25167.2"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25168.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>d4f37f88111ecbae7d1a1f8c4bc69fa96b578626</Sha> + <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>b929fc7b324b21fe74f2d1d4fe52b534046152b0</Sha> + <Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index f05b9969a926..8a352084c342 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25167.5</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25167.9</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From c3ac07e2ed47c3dcea07cf656a38f57124202df5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 05:02:11 +0000 Subject: [PATCH 10/24] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250410.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25163.2 -> To Version 8.0.0-alpha.1.25210.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0193317d580a..6f4fd0900581 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha> <SourceBuild RepoName="source-build-externals" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25210.2"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> - <Sha>b09e26d761555d806f31af68d6fe5dfdeebf6e38</Sha> + <Sha>6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c</Sha> <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1"> From a454a2ef72c16b579aad2afacd5bbea2234c1f7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 07:13:38 +0000 Subject: [PATCH 11/24] Update dependencies from https://github.com/dotnet/templating build 20250410.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25208.4 -> To Version 8.0.116-servicing.25210.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index d99e3cd905e5..7999bc230a7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> - <add key="darc-pub-dotnet-templating-eabf260" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-eabf2602/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-6bf58a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6bf58a48/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f4fd0900581..b16e447c18fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ <ProductDependencies> <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha> + <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25208.4"> + <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25210.5"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha> + <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25208.4"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25210.5"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha> + <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14"> diff --git a/eng/Versions.props b/eng/Versions.props index 954e3e806699..148e873ea944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion> <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion> <!-- test dependencies --> - <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25208.4</MicrosoftTemplateEngineMocksPackageVersion> + <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25210.5</MicrosoftTemplateEngineMocksPackageVersion> <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion> <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion> <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion> From 8c669b441a3ce8a9e9a19412fe6107dc45c511d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 02:39:33 +0000 Subject: [PATCH 12/24] Update dependencies from https://github.com/dotnet/msbuild build 20250415.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.25-servicing-25210-01 -> To Version 17.8.26-servicing-25215-03 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e6b51e11fca..a887c9cd65d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,27 +3,23 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-format --> <add key="darc-pub-dotnet-format-664013f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-664013fb/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-format --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> - <add key="darc-pub-DotNet-msbuild-Trusted-6cb62fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6cb62fe4/nuget/v3/index.json" /> + <add key="darc-pub-DotNet-msbuild-Trusted-65a6534" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-65a65342/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-roslyn-analyzers --> <!-- End: Package sources from dotnet-roslyn-analyzers --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-6bf58a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6bf58a48/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -48,16 +44,13 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-8899cb3" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-83fc500" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0177df21f69f..92f29aded7e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ <Uri>https://github.com/dotnet/emsdk</Uri> <Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha> </Dependency> - <Dependency Name="Microsoft.Build" Version="17.8.25"> + <Dependency Name="Microsoft.Build" Version="17.8.26"> <Uri>https://github.com/dotnet/msbuild</Uri> - <Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha> + <Sha>65a653424fe3f83acca71ce5083b0d038bc50ea3</Sha> </Dependency> - <Dependency Name="Microsoft.Build.Localization" Version="17.8.25-servicing-25210-01"> + <Dependency Name="Microsoft.Build.Localization" Version="17.8.26-servicing-25215-03"> <Uri>https://github.com/dotnet/msbuild</Uri> - <Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha> + <Sha>65a653424fe3f83acca71ce5083b0d038bc50ea3</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.25-servicing-25210-01"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.26-servicing-25215-03"> <Uri>https://github.com/dotnet/msbuild</Uri> - <Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha> + <Sha>65a653424fe3f83acca71ce5083b0d038bc50ea3</Sha> <SourceBuild RepoName="msbuild" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2"> diff --git a/eng/Versions.props b/eng/Versions.props index a61014ae5e18..9b1f067f196d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/Microsoft/msbuild --> - <MicrosoftBuildPackageVersion>17.8.25</MicrosoftBuildPackageVersion> + <MicrosoftBuildPackageVersion>17.8.26</MicrosoftBuildPackageVersion> <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion> <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest, so target one that matches the version in minimumMSBuildVersion. @@ -130,7 +130,7 @@ <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion> - <MicrosoftBuildLocalizationPackageVersion>17.8.25-servicing-25210-01</MicrosoftBuildLocalizationPackageVersion> + <MicrosoftBuildLocalizationPackageVersion>17.8.26-servicing-25215-03</MicrosoftBuildLocalizationPackageVersion> <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion> <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion> <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion> From dad629d4468a76ba18a56a59f054144852347e2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 05:01:44 +0000 Subject: [PATCH 13/24] Update dependencies from https://github.com/dotnet/arcade build 20250414.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7 --- NuGet.config | 7 ------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdl/packages.config | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e6b51e11fca..7999bc230a7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,13 +3,11 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-format --> <add key="darc-pub-dotnet-format-664013f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-664013fb/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-format --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <add key="darc-pub-DotNet-msbuild-Trusted-6cb62fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6cb62fe4/nuget/v3/index.json" /> @@ -17,13 +15,11 @@ <!-- Begin: Package sources from dotnet-roslyn-analyzers --> <!-- End: Package sources from dotnet-roslyn-analyzers --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-6bf58a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6bf58a48/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> @@ -48,16 +44,13 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-8899cb3" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-format --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-50c4cb9" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-83fc500" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0177df21f69f..ecf009527cd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha> + <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha> + <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25208.7"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25214.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha> + <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha> + <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index a61014ae5e18..934bcca77584 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>8.0.0-beta.25214.7</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -209,7 +209,7 @@ <PropertyGroup> <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion> <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.18.4</MoqPackageVersion> <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion> <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion> diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba1..e5f543ea68c2 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Guardian.Cli" version="0.109.0"/> + <package id="Microsoft.Guardian.Cli" version="0.199.0"/> </packages> diff --git a/global.json b/global.json index 1918bc6863ac..5208b63f114e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7" } } From 19eed867b210003b7db9548bc05bb017f3968546 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 06:47:17 +0000 Subject: [PATCH 14/24] Update dependencies from https://github.com/dotnet/templating build 20250414.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25210.5 -> To Version 8.0.116-servicing.25214.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index a887c9cd65d0..44b4b84c46ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> - <add key="darc-pub-dotnet-templating-6bf58a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6bf58a48/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f29aded7e4..aad321f88a2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ <ProductDependencies> <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> + <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25210.5"> + <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25214.4"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> + <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25210.5"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25214.4"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>6bf58a48e7d3cb12a0d276047e15bc1652c10195</Sha> + <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> diff --git a/eng/Versions.props b/eng/Versions.props index 9b1f067f196d..397683a7b2d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion> <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion> <!-- test dependencies --> - <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25210.5</MicrosoftTemplateEngineMocksPackageVersion> + <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25214.4</MicrosoftTemplateEngineMocksPackageVersion> <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion> <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion> <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion> From 45a7348b89ecd488648f4e78c1249b82ca2b6f52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 23:22:16 +0000 Subject: [PATCH 15/24] Update dependencies from https://github.com/dotnet/razor build 20250425.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25175.8 -> To Version 7.0.0-preview.25225.5 --- NuGet.config | 1 + eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44b4b84c46ae..96cf6e01981f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c91a5123064c..7b2030ff400d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25175.8"> + <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25225.5"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> <SourceBuild RepoName="razor" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25175.8"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25225.5"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25175.8"> + <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25225.5"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> </Dependency> diff --git a/eng/Versions.props b/eng/Versions.props index 8c26bd229d72..f71450caf7f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ </PropertyGroup> <!-- Dependencies from https://github.com/dotnet/razor --> <PropertyGroup> - <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25175.8</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion> - <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25175.8</MicrosoftCodeAnalysisRazorToolingInternalVersion> - <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25175.8</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion> + <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25225.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion> + <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25225.5</MicrosoftCodeAnalysisRazorToolingInternalVersion> + <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25225.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> From 77f2bacaf91065a37ae2f4e2df8731bcd2a93b74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Apr 2025 02:01:44 +0000 Subject: [PATCH 16/24] Update dependencies from https://github.com/dotnet/arcade build 20250425.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25225.5 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 4 ++-- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/job/source-index-stage1.yml | 4 ++-- global.json | 4 ++-- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44b4b84c46ae..96cf6e01981f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c91a5123064c..77e0fc3fd841 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25225.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> + <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25225.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> + <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25214.7"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25225.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> + <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25225.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha> + <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 8c26bd229d72..91cd7c53295d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>8.0.0-beta.25214.7</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>8.0.0-beta.25225.5</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -209,7 +209,7 @@ <PropertyGroup> <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion> <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25225.5</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.18.4</MoqPackageVersion> <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion> <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion> diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f983033bb028..4217d6d8b148 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -54,7 +54,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 60dfb6b2d1c0..fb632b71a250 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c0ff472b697b..c48f95d93d91 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -54,11 +54,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 0b6bb89dc78a..8538f44bab28 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 5208b63f114e..8395681dbeb6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25225.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25225.5" } } From d8e10155a3196d2d381f848ceb9c882b0b66f1c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Apr 2025 02:02:14 +0000 Subject: [PATCH 17/24] Update dependencies from https://github.com/dotnet/arcade build 20250428.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25228.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77e0fc3fd841..0fbe06976da2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25225.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25228.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> + <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25225.5"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25228.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> + <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25225.5"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25228.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> + <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25225.5"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25228.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha> + <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 91cd7c53295d..7aa7b5664deb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>8.0.0-beta.25225.5</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>8.0.0-beta.25228.2</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -209,7 +209,7 @@ <PropertyGroup> <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion> <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25225.5</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25228.2</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.18.4</MoqPackageVersion> <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion> <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion> diff --git a/global.json b/global.json index 8395681dbeb6..e59cdf9b4461 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25225.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25225.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25228.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25228.2" } } From fab47373dc7f55b5d6020484b494e0e60ab9c87a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Apr 2025 02:02:13 +0000 Subject: [PATCH 18/24] Update dependencies from https://github.com/dotnet/arcade build 20250429.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25229.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/jobs/source-build.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fbe06976da2..d6744bee6aeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25228.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25229.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> + <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25228.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25229.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> + <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25228.2"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25229.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> + <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25228.2"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25229.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0</Sha> + <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 7aa7b5664deb..8d44fb0ef157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>8.0.0-beta.25228.2</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>8.0.0-beta.25229.5</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -209,7 +209,7 @@ <PropertyGroup> <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion> <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25228.2</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25229.5</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.18.4</MoqPackageVersion> <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion> <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion> diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 5cf6a269c0b6..b9247be1547b 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 5f46bfa895c1..3ec997108107 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index e59cdf9b4461..0d057253d827 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25228.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25228.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25229.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25229.5" } } From 1108ffd1030a36398a69cd93ed55b8c9453f33b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 02:02:05 +0000 Subject: [PATCH 19/24] Update dependencies from https://github.com/dotnet/arcade build 20250430.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25230.1 --- NuGet.config | 3 +++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 96cf6e01981f..15c7d2f74cf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,9 @@ <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-7/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-6/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-5/nuget/v3/index.json" /> <add key="darc-pub-dotnet-templating-c0c76f0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6744bee6aeb..9526d4f9ed93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25229.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25230.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> + <Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25229.5"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25230.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> + <Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25229.5"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25230.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> + <Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25229.5"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25230.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>6448619bfaaef14e8787f27d94b537d7ec73f36f</Sha> + <Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 8d44fb0ef157..6be1f635e55c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>8.0.0-beta.25229.5</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>8.0.0-beta.25230.1</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -209,7 +209,7 @@ <PropertyGroup> <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion> <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25229.5</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25230.1</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.18.4</MoqPackageVersion> <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion> <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion> diff --git a/global.json b/global.json index 0d057253d827..5fa65d6275d1 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25229.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25229.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25230.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25230.1" } } From c4727b74c871bb6f4b57e150f8d9df0a630769ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 17:17:26 +0000 Subject: [PATCH 20/24] Update dependencies from https://github.com/dotnet/razor build 20250507.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25175.8 -> To Version 7.0.0-preview.25257.3 --- NuGet.config | 3 +++ eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 96cf6e01981f..15c7d2f74cf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,9 @@ <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-7/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-6/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-c0c76f0-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-5/nuget/v3/index.json" /> <add key="darc-pub-dotnet-templating-c0c76f0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b2030ff400d..99901ec9d1a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha> </Dependency> - <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25225.5"> + <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25257.3"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> <SourceBuild RepoName="razor" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25225.5"> + <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25257.3"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25225.5"> + <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25257.3"> <Uri>https://github.com/dotnet/razor</Uri> <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha> </Dependency> diff --git a/eng/Versions.props b/eng/Versions.props index f71450caf7f4..4cf977b40d63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ </PropertyGroup> <!-- Dependencies from https://github.com/dotnet/razor --> <PropertyGroup> - <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25225.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion> - <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25225.5</MicrosoftCodeAnalysisRazorToolingInternalVersion> - <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25225.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion> + <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25257.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion> + <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25257.3</MicrosoftCodeAnalysisRazorToolingInternalVersion> + <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25257.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> From 76d78fad43ced6861629712c20d5ae9de7101cc8 Mon Sep 17 00:00:00 2001 From: Sean Reeser <v-seanreeser@microsoft.com> Date: Wed, 7 May 2025 14:48:18 -0700 Subject: [PATCH 21/24] Update branding to 8.0.117 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c26bd229d72..0f6772a44a35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ </PropertyGroup> <!-- Repo Version Information --> <PropertyGroup> - <VersionPrefix>8.0.116</VersionPrefix> + <VersionPrefix>8.0.117</VersionPrefix> <!-- Enable to remove prerelease label. --> <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion> <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind> From ec7c6c30016477be519781eaacc44f06e6a061f2 Mon Sep 17 00:00:00 2001 From: Jason Zhai <v-wuzhai@microsoft.com> Date: Wed, 7 May 2025 18:59:53 -0700 Subject: [PATCH 22/24] Update queue to ubuntu 2204 --- eng/common/templates-official/job/source-build.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f983033bb028..4217d6d8b148 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -54,7 +54,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c0ff472b697b..c48f95d93d91 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -54,11 +54,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} From 29b1d6400f7589d449291e07e85fe9cfbb27534e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 03:41:24 +0000 Subject: [PATCH 23/24] Update dependencies from https://github.com/dotnet/templating build 20250507.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.6 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44b4b84c46ae..2c15bd622c34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> - <add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-7d9cdb5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d9cdb5e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c91a5123064c..fbf117c43df4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116"> + <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.117"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> + <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25214.4"> + <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.117-servicing.25257.6"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> + <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25214.4"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.117-servicing.25257.6"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>c0c76f0d615cf894eeb84536467e4b2d28174a46</Sha> + <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> diff --git a/eng/Versions.props b/eng/Versions.props index 8c26bd229d72..73d7758b3a1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/templating --> - <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.116</MicrosoftTemplateEngineAbstractionsPackageVersion> + <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.117</MicrosoftTemplateEngineAbstractionsPackageVersion> <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion> <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion> <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion> <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion> <!-- test dependencies --> - <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25214.4</MicrosoftTemplateEngineMocksPackageVersion> + <MicrosoftTemplateEngineMocksPackageVersion>8.0.117-servicing.25257.6</MicrosoftTemplateEngineMocksPackageVersion> <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion> <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion> <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion> From 4daa391c270d75b0f9fef4ccfd53a94db2979f9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 05:09:13 +0000 Subject: [PATCH 24/24] Update dependencies from https://github.com/dotnet/templating build 20250507.13 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.13 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c15bd622c34..e364749e2a3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ <!-- Begin: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> - <add key="darc-pub-dotnet-templating-7d9cdb5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d9cdb5e/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-dde824a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-dde824a1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbf117c43df4..458ecdcb0c55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ <ProductDependencies> <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.117"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> + <Sha>dde824a1cac39339d38c5660b494c667c69aa7df</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.117-servicing.25257.6"> + <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.117-servicing.25257.13"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> + <Sha>dde824a1cac39339d38c5660b494c667c69aa7df</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.117-servicing.25257.6"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.117-servicing.25257.13"> <Uri>https://github.com/dotnet/templating</Uri> - <Sha>7d9cdb5e02e27daeead69fa7da4d1fd8cdb7a9e7</Sha> + <Sha>dde824a1cac39339d38c5660b494c667c69aa7df</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15"> diff --git a/eng/Versions.props b/eng/Versions.props index 73d7758b3a1f..22445dc72d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion> <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion> <!-- test dependencies --> - <MicrosoftTemplateEngineMocksPackageVersion>8.0.117-servicing.25257.6</MicrosoftTemplateEngineMocksPackageVersion> + <MicrosoftTemplateEngineMocksPackageVersion>8.0.117-servicing.25257.13</MicrosoftTemplateEngineMocksPackageVersion> <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion> <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion> <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>