Skip to content

Commit

Permalink
Merged PR 43791: [internal/release/6.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:1746fd8a-3905-4afb-af8a-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 1746fd8a-3905-4afb-af8a-08d961c59698
- **Build**: 20241014.21
- **Date Produced**: October 15, 2024 6:38:25 AM UTC
- **Commit**: f1dd57165bfd91875761329ac3a8b17f6606ad18
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **Microsoft.NET.Sdk.IL**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.35 to 6.0.36][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.35 to 6.0.36][1]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **Microsoft.Win32.Registry.AccessControl**: [from 6.0.0 to 6.0.1][2]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]
  - **System.Configuration.ConfigurationManager**: [from 6.0.1 to 6.0.2][3]
  - **System.Diagnostics.PerformanceCounter**: [from 6.0.1 to 6.0.2][4]
  - **System.DirectoryServices**: [from 6.0.1 to 6.0.2][5]
  - **System.IO.Packaging**: [from 6.0.1 to 6.0.2][1]
  - **System.Reflection.MetadataLoadContext**: [from 6.0.0 to 6.0.1][2]
  - **System.Security.Cryptography.Pkcs**: [from 6.0.3 to 6.0.5][6]
  - **System.Security.Cryptography.Xml**: [from 6.0.1 to 6.0.2][7]
  - **System.Security.Permissions**: [from 6.0.0 to 6.0.1][2]
  - **System.Text.Encodings.Web**: [from 6.0.0 to 6.0.1][2]
  - **System.Text.Json**: [from 6.0.10 to 6.0.11][1]
  - **System.Threading.AccessControl**: [from 6.0.0 to 6.0.1][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb357f86ce3bce7c232ea242074b17bebdc50b543&targetVersion=GCf1dd57165bfd91875761329ac3a8b17f6606ad18&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4822e3c3aa77eb82b2fb33c9321f923cf11ddde6&targetVersion=GCf1dd57165bfd91875761329ac3a8b17f6606ad18&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC163a63591cf9e9b682063cf3995948c2b885a042&targetVersion=GCf1dd57165bfd91875761329ac3a8b17f6606ad18&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCbe98e88c760526452df94ef452fff4602fb5bded&targetVersion=GCf1dd57165bfd91875761329ac3a8b17f6606ad18&_a=files
[5]: https://dev.azure.com/dnceng/intern...
  • Loading branch information
maestro-prod-Primary authored and vseanreesermsft committed Oct 15, 2024
1 parent 812b7e2 commit e0de28a
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 71 deletions.
6 changes: 2 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +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-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-b357f86-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-f1dd571" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f1dd5716/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" />
Expand All @@ -20,8 +19,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-b357f86-2" value="true" />
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
<add key="darc-int-dotnet-runtime-f1dd571" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
94 changes: 47 additions & 47 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ 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.6.0" Version="6.0.35-servicing.24459.18">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -23,9 +23,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.1">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -35,93 +35,93 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
<Dependency Name="System.Security.Permissions" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.35-servicing.24459.18">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.35-servicing.24459.18">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.35-servicing.24459.18">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.35-servicing.24459.18">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.1">
<Dependency Name="System.DirectoryServices" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.1">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.1">
<Dependency Name="System.IO.Packaging" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.35-servicing.24459.18">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="6.0.1">
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.3">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
<Dependency Name="System.Text.Encodings.Web" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="6.0.10">
<Dependency Name="System.Text.Json" Version="6.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
<Dependency Name="System.Threading.AccessControl" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.36">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.35">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.36">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.35-servicing.24459.18">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.36-servicing.24514.21">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
<Sha>f1dd57165bfd91875761329ac3a8b17f6606ad18</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,34 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.35-servicing.24459.18</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.36-servicing.24514.21</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>6.0.1</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>6.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>6.0.1</SystemIOPackagingPackageVersion>
<SystemDirectoryServicesPackageVersion>6.0.2</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>6.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>6.0.2</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>6.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.3</SystemSecurityCryptographyPkcsPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.36-servicing.24514.21</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>6.0.2</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.5</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.10</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>6.0.0</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>6.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.35</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.35</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.11</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>6.0.1</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>6.0.1</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.36</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.36</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.13</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>6.0.1</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>6.0.0</SystemDrawingCommonPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.35-servicing.24459.18</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.35-servicing.24459.18</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.36-servicing.24514.21</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.36-servicing.24514.21</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.36-servicing.24514.21</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24508.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24508.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.35-servicing.24459.18"
"Microsoft.NET.Sdk.IL": "6.0.36-servicing.24514.21"
},
"native-tools": {
"cmake": "latest"
Expand Down

0 comments on commit e0de28a

Please sign in to comment.