diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67b65a4d575ef..89c196c46d976 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,33 +170,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a - + https://github.com/dotnet/runtime - ea982829538c1055155b6c767f3821329e1e9600 + be27e294a12514638bb5337c7fe5cc72d93a443a https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 8c32633376872..ba5851f4cbfa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 6.0.0-beta.20614.8 6.0.0-alpha.1.20612.4 - 6.0.0-alpha.1.20615.7 - 6.0.0-alpha.1.20615.7 + 6.0.0-alpha.1.20616.14 + 6.0.0-alpha.1.20616.14 3.1.0 - 6.0.0-alpha.1.20615.7 + 6.0.0-alpha.1.20616.14 1.2.0-beta.304 4.5.1 @@ -98,14 +98,14 @@ 4.7.0 4.7.0 4.7.0 - 6.0.0-alpha.1.20615.7 - 6.0.0-alpha.1.20615.7 + 6.0.0-alpha.1.20616.14 + 6.0.0-alpha.1.20616.14 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-alpha.1.20615.7 + 6.0.0-alpha.1.20616.14 5.0.0-beta.20607.2 5.0.0-beta.20607.2 diff --git a/global.json b/global.json index e445b68417a30..5b1ab8d9b9cba 100644 --- a/global.json +++ b/global.json @@ -17,7 +17,8 @@ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20614.8", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20614.8", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20614.8", - "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20615.7", + "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", + "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20616.14", "Microsoft.Build.NoTargets": "2.0.1", "Microsoft.Build.Traversal": "2.1.1" }