[0.63] 3 Hacks to fix breaking changes from nuget affecting 0.63 pipe…

…lines (#7918) * Try to work around new nuget braking change * Change files
microsoft · Jun 2, 2021 · bc22bbc · bc22bbc
1 parent 29eca7d
commit bc22bbc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.ado/variables/vs2019.yml b/.ado/variables/vs2019.yml
@@ -6,3 +6,4 @@ variables:
   runCodesignValidationInjection: false
   NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS: 60
   NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS: 60
+  MSBUILDLOGPROPERTIESANDITEMSAFTEREVALUATION: false
diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
@@ -320,14 +320,6 @@ jobs:
 
       - template: templates/prepare-env.yml
 
-      - task: NuGetCommand@2
-        displayName: NuGet restore - SampleApps
-        inputs:
-          command: restore
-          restoreSolution: packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
-          verbosityRestore: Detailed # Options: quiet, normal, detailed
-        condition: succeeded()
-
       - task: CmdLine@2
         displayName: run-windows (Debug)
         inputs:

diff --git a/Directory.Build.rsp b/Directory.Build.rsp
@@ -0,0 +1,2 @@
+/restore
+/p:RestorePackagesConfig=true
diff --git a/change/react-native-windows-2021-06-01-21-05-37-main.json b/change/react-native-windows-2021-06-01-21-05-37-main.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Try to work around new nuget braking change",
+  "packageName": "react-native-windows",
+  "email": "dannyvv@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2021-06-02T04:05:37.421Z"
+}
diff --git a/vnext/PropertySheets/Autolink.props b/vnext/PropertySheets/Autolink.props
@@ -9,7 +9,7 @@
     <RunAutolinkCheck Condition="'$(RunAutolinkCheck)' == ''">true</RunAutolinkCheck>
     <AutolinkCommand Condition="'$(AutolinkCommand)' == ''">npx react-native autolink-windows</AutolinkCommand>
     <AutolinkCommandWorkingDir Condition="'$(AutolinkCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</AutolinkCommandWorkingDir>
-    <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == '' And '$(SolutionPath)' != '' And '$(ProjectPath)' != ''">--check --sln $([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(SolutionPath))) --proj $([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(ProjectPath)))</AutolinkCommandArgs>
+    <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == '' And '$(SolutionPath)' != '' And '$(SolutionPath)' != '*Undefined*' And '$(ProjectPath)' != ''">--check --sln $([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(SolutionPath))) --proj $([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(ProjectPath)))</AutolinkCommandArgs>
     <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == ''">--check</AutolinkCommandArgs>
   </PropertyGroup>