Ensure restore works from clean

novotnyllc · Jul 9, 2018 · d812535 · d812535
1 parent 28f4481
commit d812535
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 35 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets b/Source/MSBuild.Sdk.Extras/Build/ReferenceAssembly.targets
@@ -36,7 +36,7 @@
   </Target>
 
   <!-- If we have any ReferenceAssemblyProjectReference items, ensure restore is called on them  -->
-  <Target Name="_ExtrasRestoreReferenceAssembly" BeforeTargets="_LoadRestoreGraphEntryPoints">
+  <Target Name="_ExtrasRestoreReferenceAssembly" AfterTargets="_LoadRestoreGraphEntryPoints" BeforeTargets="_FilterRestoreGraphProjectInputItems">
     <PropertyGroup>
       <_ExtrasHasReferenceAssembly Condition="'@(ReferenceAssemblyProjectReference)' != ''">true</_ExtrasHasReferenceAssembly>
       <_ExtrasHasReferenceAssembly Condition="'$(_ExtrasHasReferenceAssembly)' == ''">false</_ExtrasHasReferenceAssembly>

diff --git a/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj b/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj
@@ -16,38 +16,5 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Source\MSBuild.Sdk.Extras\Sdk\Sdk.targets" />
 	<Import Project="..\Test.targets" />
-	<ItemGroup>
-	  <None Include="Classlibrary\Classlibrary.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Update="Classlibrary\Resource1.Designer.cs">
-	    <DesignTime>True</DesignTime>
-	    <AutoGen>True</AutoGen>
-	    <DependentUpon>Resource1.resx</DependentUpon>
-	  </Compile>
-	  <Compile Update="Resource1.Designer.cs">
-	    <DesignTime>True</DesignTime>
-	    <AutoGen>True</AutoGen>
-	    <DependentUpon>Resource1.resx</DependentUpon>
-	  </Compile>
-	</ItemGroup>
-	<ItemGroup>
-	  <EmbeddedResource Update="Classlibrary\Resource1.resx">
-	    <Generator>ResXFileCodeGenerator</Generator>
-	    <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
-	  </EmbeddedResource>
-	  <EmbeddedResource Update="Resource1.resx">
-	    <Generator>ResXFileCodeGenerator</Generator>
-	    <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
-	  </EmbeddedResource>
-	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Classlibrary\bin\Debug\monoandroid70\MonoAndroid70\" />
-	  <Folder Include="Classlibrary\obj\Debug\lp\0\jl\" />
-	  <Folder Include="Classlibrary\obj\Debug\monoandroid70\MonoAndroid70\designtime\" />
-	  <Folder Include="Classlibrary\obj\Debug\monoandroid70\MonoAndroid70\lp\0\jl\" />
-	  <Folder Include="Classlibrary\obj\Debug\monoandroid70\MonoAndroid70\res\" />
-	  <Folder Include="Classlibrary\obj\Debug\res\" />
-	</ItemGroup>
-
+
 </Project>