diff --git a/NuGet.config b/NuGet.config index 714c7a75c..1e3cdca5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,17 @@ + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01b9b9fdf..3141338fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 https://github.com/dotnet/windowsdesktop - 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 + fc790f5c5a5503ffc2b4c9f81307cf1a75d7bc77 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 + 6f41165853278914d1a28d7f325ebe04ab78ac07 - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef - + https://github.com/dotnet/aspnetcore - 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 + 20de863bd37ad521b7a3bd6056186da5e8a7a2ef https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/templating - e380623de8e689cd7209ffe0881b744413e3e0d6 + afb8dfb313ad614fb1f13bde72e7c965ad219990 - + https://github.com/dotnet/sdk - 4d19f430e05e0c0771b6abf86be9bf137f2cc242 + a7f1f2fadcb9c9564618602f76ae8df54e24ca5a - + https://github.com/dotnet/sdk - 4d19f430e05e0c0771b6abf86be9bf137f2cc242 + a7f1f2fadcb9c9564618602f76ae8df54e24ca5a - + https://github.com/dotnet/winforms - 080dcacb82db540cc26e5bf9882c6af9320ba535 + a4e643851b62969e46b9a208f9d32dfde6c93b95 - + https://github.com/dotnet/wpf - eee7eff2c7837b56fdb7f313540de74bc1b41a41 + 7dba431f76d513ae009c58a2c588e7be5ac2dd45 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 73c8cd3619efc79364fef5fa81989f9e0dd2147b + 7b2c3228bec174e2ef12bc189e9c176eafd24334 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c368e9410..fda225b62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21519.4 + 6.0.0-rtm.21520.13 - 6.0.0-rtm.21519.8 + 6.0.0-rtm.21520.13 - 6.0.100-rtm.21519.1 + 6.0.100-rtm.21521.1 @@ -44,42 +44,42 @@ - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 - 6.0.0-rtm.21519.6 + 6.0.0 + 6.0.0 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 + 6.0.0-rtm.21521.1 0.2.0 - 6.0.100-rtm.21520.1 - 6.0.100-rtm.21520.1 + 6.0.100-rtm.21521.3 + 6.0.100-rtm.21521.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rtm.21518.12 + 6.0.0 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 - 6.0.0-rtm.21518.12 + 6.0.0-rtm.21520.9 + 6.0.0-rtm.21520.9 + 6.0.0 + 6.0.0 + 6.0.0 + 6.0.0 2.1.0 - 6.0.0-rtm.21519.11 - 6.0.0-rtm.21519.11 + 6.0.0-rtm.21520.17 + 6.0.0-rtm.21520.17 6.0.0 6.0.0 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21519.1 + 6.0.100-rtm.21521.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -171,7 +171,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rtm.21514.1 + 6.0.0 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch deleted file mode 100644 index a39dd0021..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Enable-targeting-pack-build-during-source-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 18 Oct 2021 14:25:29 -0500 -Subject: [PATCH] Enable targeting pack build during source-build - -For prebuilt removal: https://github.com/dotnet/source-build/issues/2506 - -Upstream PR to main: https://github.com/dotnet/aspnetcore/pull/37652 ---- - Directory.Build.props | 1 - - Directory.Build.targets | 4 ++-- - .../CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj | 7 +++++++ - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 204df64da7..77045590cd 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -142,7 +142,6 @@ - aspnetcore-targeting-pack - - -- false - false - true -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 6e30c30881..1f1616124b 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,10 +1,10 @@ -  - - -- -+ - - true -+ Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true - - -diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -index d70178504e..02bad93889 100644 ---- a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -+++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj -@@ -2,6 +2,13 @@ - - CSharp CodeFixes for ASP.NET Core. - false -+ -+ true - false - netstandard2.0 - false