diff --git a/NuGet.config b/NuGet.config index 9cf6ae26306..b172b9d4570 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -22,6 +23,7 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-2d7eea2" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!--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 0e8106a31ad..8654ad44226 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,13 +7,13 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> <Dependencies> <ProductDependencies> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.3-servicing.24114.23"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.3-servicing.24114.23"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> <Dependency Name="System.Resources.Extensions" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -23,29 +23,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.3-servicing.24114.23"> + <Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.3-servicing.24114.23"> + <Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.3-servicing.24114.23"> + <Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.3-servicing.24114.23"> + <Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.3-servicing.24114.23"> + <Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> <Dependency Name="System.Text.Encodings.Web" Version="8.0.0"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -55,17 +55,17 @@ Note: if the Uri is a new place, you will need to add a subscription from that p <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.3"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.3"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> - <Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.3-servicing.24114.23"> + <Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.4-servicing.24169.9"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha> + <Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha> </Dependency> <!-- These dependencies are required by windowsdesktop for coherency. --> <Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0"> diff --git a/eng/Versions.props b/eng/Versions.props index f4d0393799e..e37b173ae88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,14 +16,14 @@ </PropertyGroup> <!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro --> <PropertyGroup> - <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.3-servicing.24114.23</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.4-servicing.24169.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion> <SystemDiagnosticsEventLogPackageVersion>8.0.0</SystemDiagnosticsEventLogPackageVersion> <SystemDirectoryServicesPackageVersion>8.0.0</SystemDirectoryServicesPackageVersion> <SystemReflectionMetadataLoadContextPackageVersion>8.0.0</SystemReflectionMetadataLoadContextPackageVersion> <SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion> <SystemIOPackagingPackageVersion>8.0.0</SystemIOPackagingPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> - <MicrosoftNETCoreILDAsmPackageVersion>8.0.3-servicing.24114.23</MicrosoftNETCoreILDAsmPackageVersion> + <MicrosoftNETCoreILDAsmPackageVersion>8.0.4-servicing.24169.9</MicrosoftNETCoreILDAsmPackageVersion> <SystemDiagnosticsPerformanceCounterPackageVersion>8.0.0</SystemDiagnosticsPerformanceCounterPackageVersion> <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion> <SystemSecurityCryptographyPkcsPackageVersion>8.0.0</SystemSecurityCryptographyPkcsPackageVersion> @@ -32,18 +32,18 @@ <SystemTextJsonPackageVersion>8.0.3</SystemTextJsonPackageVersion> <SystemThreadingAccessControlPackageVersion>8.0.0</SystemThreadingAccessControlPackageVersion> <MicrosoftWin32RegistryAccessControlPackageVersion>8.0.0</MicrosoftWin32RegistryAccessControlPackageVersion> - <MicrosoftNETCoreAppRefPackageVersion>8.0.3</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion> - <MicrosoftNETCorePlatformsPackageVersion>8.0.3-servicing.24114.23</MicrosoftNETCorePlatformsPackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>8.0.4</MicrosoftNETCoreAppRefPackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCorePlatformsPackageVersion>8.0.4-servicing.24169.9</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion> <SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion> <SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion> <SystemResourcesExtensionsPackageVersion>8.0.0</SystemResourcesExtensionsPackageVersion> <SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion> <SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion> - <MicrosoftNETCoreILAsmPackageVersion>8.0.3-servicing.24114.23</MicrosoftNETCoreILAsmPackageVersion> - <runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.3-servicing.24114.23</runtimewinx64MicrosoftNETCoreILAsmPackageVersion> - <runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.3-servicing.24114.23</runtimewinx86MicrosoftNETCoreILAsmPackageVersion> + <MicrosoftNETCoreILAsmPackageVersion>8.0.4-servicing.24169.9</MicrosoftNETCoreILAsmPackageVersion> + <runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.4-servicing.24169.9</runtimewinx64MicrosoftNETCoreILAsmPackageVersion> + <runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.4-servicing.24169.9</runtimewinx86MicrosoftNETCoreILAsmPackageVersion> <!-- Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion --> diff --git a/global.json b/global.json index 22ee2cda403..cf85e8b412c 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24165.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "8.0.3-servicing.24114.23" + "Microsoft.NET.Sdk.IL": "8.0.4-servicing.24169.9" }, "native-tools": { "cmake": "latest"