diff --git a/NuGet.config b/NuGet.config index 881f29147..774c3b7b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,23 @@ + + + + + + @@ -36,11 +42,16 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dffe8c3f1..574b125c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e6d9bf1868c4aa2808714ada839018a8506bd7dd + eeae34ecb55d49616c9cd79bebfd6978b9ee54a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b6be31b19097cb47125075ca2e8322bf591fc0 + 11428db5b702966c7750a82c099718a398a1aa15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b6be31b19097cb47125075ca2e8322bf591fc0 + 11428db5b702966c7750a82c099718a398a1aa15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp @@ -135,15 +135,15 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - cc3dc76c374152f86ff73aa02f35782b713908c6 + 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe linker - + https://github.com/dotnet/roslyn - 592501cbb9c9394072a245c15b3458ff88155d85 + dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 @@ -166,13 +166,17 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - e8ffccbd683205bf94e406e43556f8baca07dc5b + ee0a97a0009c0e048789126253fea7994db676ac - + + https://github.com/dotnet/emsdk + ee0a97a0009c0e048789126253fea7994db676ac + + https://github.com/dotnet/source-build - 10d0f7e94aa45889155c312f51cfc01bf326b853 + 90bdf447e1b97605f109b34243ab8c9f215308e9 diff --git a/eng/Versions.props b/eng/Versions.props index eb9e4941c..e6fee910c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22123.7 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22124.2 - 6.0.200 + 6.0.201 @@ -44,44 +44,44 @@ - 6.0.2 - 6.0.2 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 + 6.0.3 + 6.0.3 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.200-rtm.22104.9 - 6.0.200-rtm.22104.9 + 6.0.201-servicing.22124.17 + 6.0.201-servicing.22124.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.1 + 6.0.2 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 + 6.0.3 + 6.0.3 + 6.0.3 + 6.0.3 2.1.0 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22124.3 + 6.0.3-servicing.22124.3 + 6.0.3 + 6.0.3 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.200 + 6.0.201 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -183,7 +183,7 @@ 12.1.301-preview.13.2 15.2.301-preview.13.2 6.0.2-mauipre.1.22102.15 - 6.0.1 + 6.0.2 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch deleted file mode 100644 index ef507ed95..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5211f8557f2fb019416cf1f6c01142965270479 Mon Sep 17 00:00:00 2001 -From: Doug Bunting <6431421+dougbu@users.noreply.github.com> -Date: Sun, 16 Jan 2022 22:55:10 -0800 -Subject: [PATCH] Always build App.Ref and the targeting packs - set - `$(IsTargetingPackBuilding)` to `true` unconditionally - leave all _use_ of - `$(IsTargetingPackBuilding)` - -See https://github.com/dotnet/aspnetcore/issues/39471 for details and backporting. ---- - Directory.Build.props | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index e100d883e9..d71b308905 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -138,11 +138,7 @@ - Microsoft.AspNetCore.App.Ref - aspnetcore-runtime - aspnetcore-targeting-pack -- -- -- false -- true -+ true - -