diff --git a/NuGet.config b/NuGet.config index 9f218a9eb..a16ff438c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d9644e96..fe777f48b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd34abdadac5668452e0496cfadb6cf985ec3d3f + e5f183b656a0e8bc087108130a5a9b54ae94494e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 93b13a284cbd00922988bc357c99ed4e7d45f153 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 640fb21ffabaef2ab5bef766ff9dba41112518c6 + 22d868d384c490b46b4eaf17c0512ec8f55f58df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 640fb21ffabaef2ab5bef766ff9dba41112518c6 + 22d868d384c490b46b4eaf17c0512ec8f55f58df @@ -135,9 +135,9 @@ d3c6439b04452047cb62fc645ce341a034bdb5be - + https://github.com/dotnet/linker - 01c4f5905959c29f86781b85187bb676fc517ee9 + 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 linker diff --git a/eng/Versions.props b/eng/Versions.props index 773db65ee..b392de5fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.5 6.0.5 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 - 6.0.5-servicing.22214.12 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 + 6.0.5-servicing.22218.2 0.2.0 - 6.0.203-servicing.22220.14 - 6.0.203-servicing.22220.14 + 6.0.203-servicing.22221.10 + 6.0.203-servicing.22221.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch deleted file mode 100644 index f7d7668dc..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 13 Apr 2022 21:30:39 +0000 -Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build - -Removes prebuilt. -Patch for https://github.com/dotnet/linker/pull/2742 ---- - src/linker/Mono.Linker.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj -index 391300aa..d276003e 100644 ---- a/src/linker/Mono.Linker.csproj -+++ b/src/linker/Mono.Linker.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - runtime; build; native; contentfiles; analyzers; buildtransitive - all -