Upgrades System.Security.Cryptography.ProtectedData to remove Runtime…

…Identifier in N.B.T.P
NuGet · Jul 14, 2020 · 8ab12f9 · 8ab12f9
1 parent 712d9be
commit 8ab12f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/build/packages.targets b/build/packages.targets
@@ -68,7 +68,7 @@
         <PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
         <PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(PatchedSystemPackagesVersion)" />
         <PackageReference Update="System.Security.Cryptography.Cng" Version="$(PatchedSystemPackagesVersion)" />
-        <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="$(SystemPackagesVersion)" />
+        <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="$(PatchedSystemPackagesVersion)" />
         <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
         <PackageReference Update="VSLangProj" Version="7.0.3300" />
         <PackageReference Update="VSLangProj110" Version="11.0.61030" />

diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
@@ -98,9 +98,10 @@
       <IlmergeCommand>$(ILMergeExePath) ^
         /out:$(PathToMergedNuGetPack) ^
         $(ILMergePlatformArg) ^
-        /lib:$(OutputPath)\publish ^
+        /lib:$(OutputPath)publish ^
         /internalize ^
-        /xmldocs</IlmergeCommand>
+        /xmldocs ^
+        /log:$(ILMergeResultDir)IlMergeLog.txt</IlmergeCommand>
       <IlmergeCommand Condition="Exists($(MS_PFX_PATH))">$(IlmergeCommand) ^
         /delaysign ^
         /keyfile:$(MS_PFX_PATH)</IlmergeCommand>
@@ -124,15 +125,17 @@
       <IlmergeCommand>$(ILMergeExePath) ^
         /out:$(PathToMergedNuGetPackResource) ^
         $(ILMergePlatformArg) ^
+        /log ^
         /lib:$(OutputPath)\publish ^
         /internalize ^
-        /xmldocs</IlmergeCommand>
+        /xmldocs ^
+        /log:$(ILMergeResultDir)IlMergeLogResources.txt</IlmergeCommand>
       <IlmergeCommand Condition="Exists($(MS_PFX_PATH))">$(IlmergeCommand) ^
         /delaysign ^
         /keyfile:$(MS_PFX_PATH)</IlmergeCommand>
       <IlmergeCommand>$(IlmergeCommand) ^
         $(OutputPath)$(CurrentCulture)NuGet.Build.Tasks.Pack.resources.dll ^
-        @(ResourceArtifacts, ' ')</IlmergeCommand>
+        @(ResourceArtifacts, ' ^&#x0A;')</IlmergeCommand>
     </PropertyGroup>
     <Exec Command="$(IlmergeCommand)" ContinueOnError="false" />
   </Target>