Remove NuGet version workaround

microsoft · Mar 17, 2018 · a482956 · a482956
1 parent 453cbd9
commit a482956
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,9 +19,7 @@ environment:
   TreatWarningsAsErrors: true
   CodeAnalysisTreatWarningsAsErrors: true
 before_build:
-- |- # Restore TWICE. See https://github.com/AArnott/Nerdbank.GitVersioning/issues/113#issuecomment-285903085
   msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /v:quiet /t:restore
-  msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /v:quiet /t:restore > nul
 build_script:
 - msbuild src\Microsoft.VisualStudio.Threading.sln /nologo /m /fl /v:minimal /t:build,pack
 test_script:

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -44,13 +44,6 @@ steps:
     nugetConfigPath: nuget.config
   displayName: Nuget restore packages
 
-- task: NuGetCommand@2
-  inputs:
-    restoreSolution: '**\*.sln'
-    feedsToUse: config
-    nugetConfigPath: nuget.config
-  displayName: Nuget restore packages (again, to workaround Nuget bug)
-
 - task: VSBuild@1
   inputs:
     vsVersion: 15.0

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\</BaseOutputPath>
 
-    <MicroBuildVersion>2.0.44</MicroBuildVersion>
+    <MicroBuildVersion>2.0.54</MicroBuildVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
@@ -13,14 +13,4 @@
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
   </ItemGroup>
-
-  <!-- Workaround https://github.com/AArnott/Nerdbank.GitVersioning/issues/113#issuecomment-285903085 -->
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\2.1.23\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\2.1.23\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-      BeforeTargets="_GenerateRestoreProjectSpec"
-      DependsOnTargets="GetBuildVersion"
-      Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>