Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Merge pull request #43160 from vseanreesermsft/internal-merge-3.1-202…
Browse files Browse the repository at this point in the history
…2-09-13-1002

Merging internal commits for release/3.1
  • Loading branch information
carlossanlop authored Sep 14, 2022
2 parents 2269149 + 62da173 commit c6f58cb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.28-servicing.22362.2">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.29-servicing.22416.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
<Sha>f3787201149e2d57d6256c9489b3df02adcf1a6e</Sha>
<Sha>eb998b0c34d546feec6a8641f11c09c61bab8b74</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.28-servicing.22362.2">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.29-servicing.22416.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
<Sha>f3787201149e2d57d6256c9489b3df02adcf1a6e</Sha>
<Sha>eb998b0c34d546feec6a8641f11c09c61bab8b74</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.28-servicing.22362.2">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.29-servicing.22416.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
<Sha>f3787201149e2d57d6256c9489b3df02adcf1a6e</Sha>
<Sha>eb998b0c34d546feec6a8641f11c09c61bab8b74</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<MicrosoftNETCoreDotNetHostPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETSdkILPackageVersion>3.1.28-servicing.22362.2</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.1.28-servicing.22362.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.28-servicing.22362.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETSdkILPackageVersion>3.1.29-servicing.22416.2</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.1.29-servicing.22416.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.29-servicing.22416.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21552.6",
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21552.6",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "3.1.28-servicing.22362.2"
"Microsoft.NET.Sdk.IL": "3.1.29-servicing.22416.2"
}
}

0 comments on commit c6f58cb

Please sign in to comment.