diff --git a/NuGet.config b/NuGet.config index 31081bc89..4518ca310 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58b710151..9da0e138d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp @@ -141,45 +141,45 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - 3259862fadd5e784564e7d920a2d61a75f415a79 + aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb + 263571123fc3dc4a638e071234ac9fbf91913962 - + https://github.com/dotnet/msbuild - 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 + b5265ef370a651f8c3458110b804e5cbf869eeb5 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 550277e0616e549446f03fda35d3e23dff75dc01 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d @@ -227,21 +227,21 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 5263b603d90991a0c200aca8b8892c3d7cfe4751 https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 + 95f83e27806330fec09edd96e06bba3acabe3f35 diff --git a/eng/Versions.props b/eng/Versions.props index f1b7ca78b..114d2f500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24068.3 - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24068.6 @@ -72,50 +72,50 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 - 8.0.101 - 8.0.101-servicing.23580.21 - 8.0.101-servicing.23580.21 + 8.0.102 + 8.0.102-servicing.24069.16 + 8.0.102-servicing.24069.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23572.1 + 4.8.0-7.24067.24 - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.8.1-rc.2 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23578-02 + 17.8.0-release-23615-02 8.0.0-alpha.1.22557.12 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 4b2215bd4..2d04469ea 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,6 +110,7 @@ + diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 01925eb5f..fa7350c16 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ ";