diff --git a/Directory.Build.props b/Directory.Build.props index a23786b7acf6..ce3d73dcda12 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -162,13 +162,13 @@ 26.4 26.4 26.4 - 36.1 + 37.0 26.4 26.4 26.4 26.4 - 36.1 + 37.0 10.0.19041.0 10.0.20348.0 7.0 diff --git a/NuGet.config b/NuGet.config index e99d2e51f7da..17aa9aa4f1a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64ea3b944174..a19de89c018d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,173 +1,173 @@ - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/android - e8fb4bc8f779fd0d27c5c0ed04637a5dd25c083b + 1b0756f20835e2e0f4a8f757c0dd77803ca52c45 https://github.com/dotnet/android e1d3646df9cb50b2a0924f5b67fa78f9750ae489 - + https://github.com/dotnet/macios - cbe42632ab063a8b23df492692f92beeeda68a16 + c4595304de2bbb397ff48a95ea05109aacd424a3 - + https://github.com/dotnet/macios - cbe42632ab063a8b23df492692f92beeeda68a16 + c4595304de2bbb397ff48a95ea05109aacd424a3 - + https://github.com/dotnet/macios - cbe42632ab063a8b23df492692f92beeeda68a16 + c4595304de2bbb397ff48a95ea05109aacd424a3 - + https://github.com/dotnet/macios - cbe42632ab063a8b23df492692f92beeeda68a16 + c4595304de2bbb397ff48a95ea05109aacd424a3 - + https://github.com/dotnet/macios - 644ec02a86d927f38d214102bc94ba4162b13c4c + 93d37a419b17d51db04a0f58888a242e0cdfc372 - + https://github.com/dotnet/macios - 644ec02a86d927f38d214102bc94ba4162b13c4c + 93d37a419b17d51db04a0f58888a242e0cdfc372 - + https://github.com/dotnet/macios - 644ec02a86d927f38d214102bc94ba4162b13c4c + 93d37a419b17d51db04a0f58888a242e0cdfc372 - + https://github.com/dotnet/macios - 644ec02a86d927f38d214102bc94ba4162b13c4c + 93d37a419b17d51db04a0f58888a242e0cdfc372 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/xharness - 92962e5c46ac08a66ded4c5696209cc60f1a232f + 31e0b8e08f57890f7b7004b93361d69cd4b21079 - + https://github.com/dotnet/xharness - 92962e5c46ac08a66ded4c5696209cc60f1a232f + 31e0b8e08f57890f7b7004b93361d69cd4b21079 - + https://github.com/dotnet/xharness - 92962e5c46ac08a66ded4c5696209cc60f1a232f + 31e0b8e08f57890f7b7004b93361d69cd4b21079 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -175,37 +175,37 @@ - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 - + https://github.com/dotnet/dotnet - 4370ea16341331f045fa9b89cc46e03aed27195c + d64191f29ec9042e2696d8b7d8326c4bd10ba268 diff --git a/eng/Versions.props b/eng/Versions.props index 7b6f4821f05b..2defd3f6c1de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,10 @@ 10.0.20 - 11.0.100-preview.4.26230.115 + 11.0.100-preview.5.26256.105 $(MicrosoftNETSdkPackageVersion) - 11.0.100-preview.3.26203.107 - 11.0.0-preview.4.26230.115 + 11.0.0-preview.5.26256.105 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) @@ -43,18 +42,18 @@ 1.0.0-prerelease.26153.1 $(MicrosoftNETCoreAppRefPackageVersion) - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 10.3.0 10.3.0 11.0.0-preview.2.26103.111 @@ -64,19 +63,19 @@ 1.0.0-rc2 1.0.0-preview.260225.1 - 36.99.0-preview.4.137 + 36.99.0-ci.main.186 36.1.53 $(MicrosoftNetSdkAndroidManifest100100PackageVersion) - - 26.4.11514-net11-p4 - 26.4.11514-net11-p4 - 26.4.11514-net11-p4 - 26.4.11514-net11-p4 + + 26.4.11555-net11-p5 + 26.4.11555-net11-p5 + 26.4.11555-net11-p5 + 26.4.11555-net11-p5 - 26.4.10259 - 26.4.10259 - 26.4.10259 - 26.4.10259 + 26.4.10260 + 26.4.10260 + 26.4.10260 + 26.4.10260 8.0.148 @@ -85,19 +84,19 @@ 1.3.2 1.0.3179.45 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 - 11.0.0-preview.4.26230.115 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 + 11.0.0-preview.5.26256.105 10.0.2 $(MicrosoftAspNetCorePackageVersion) @@ -138,22 +137,22 @@ <_HarfBuzzSharpVersion>8.3.0.1 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728 7.0.120 - 11.0.0-prerelease.26230.4 - 11.0.0-prerelease.26230.4 - 11.0.0-prerelease.26230.4 + 11.0.0-prerelease.26064.3 + 11.0.0-prerelease.26064.3 + 11.0.0-prerelease.26064.3 0.9.2 2.0.0.4 1.3.0 0.9.0 4.2.3 9.0.0 - 11.0.0-beta.26230.115 - 11.0.0-beta.26230.115 - 11.0.0-beta.26230.115 - 11.0.0-beta.26230.115 + 11.0.0-beta.26256.105 + 11.0.0-beta.26256.105 + 11.0.0-beta.26256.105 + 11.0.0-beta.26256.105 1.1.87-gba258badda - 11.0.0-beta.26230.115 - 11.0.0-beta.26230.115 + 11.0.0-beta.26256.105 + 11.0.0-beta.26256.105 17.6.0 @@ -205,8 +204,8 @@ - - + + @@ -219,7 +218,7 @@ $([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00 $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) - 11.0.100-preview.3 + $(DotNetVersionBand) $(DotNetVersionBand) $(DotNetVersionBand) $(DotNetVersionBand) diff --git a/global.json b/global.json index 1923b067f9d1..5df30ffc4d9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "11.0.100-preview.4.26230.115" + "dotnet": "11.0.100-preview.5.26256.105" }, "sdk": { "paths": [ @@ -11,7 +11,7 @@ "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26230.115", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26230.115" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26256.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26256.105" } }