mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix problems with excluding MSBuildSdkResolver from build

Browse source
This commit is contained in:
Nick Guerrera 2017-10-18 12:17:03 -07:00
parent aea3f64ab2
commit a7aeab79d8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Compile.targets
View file

@ -15,7 +15,7 @@
<!-- Build MSBuildSdkResolver for all target frameworks (so we can build and test it x-plat) --> <!-- Build MSBuildSdkResolver for all target frameworks (so we can build and test it x-plat) -->
<MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj" <MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj"
Condition="'$(IncludeMSBuildSdkResolver)' != 'false'" /> Condition="'$(IncludeMSBuildSdkResolver)' == 'true'" />
<!-- Publish MSBuildSdkResolver for net46 (to prepare it for the VS insertion nupkg packaging) --> <!-- Publish MSBuildSdkResolver for net46 (to prepare it for the VS insertion nupkg packaging) -->
<MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj" <MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj"

4
build/Prepare.targets
View file

@ -68,8 +68,8 @@
<Target Name="SetupRestoreSrcPackagesInputsOutputs"> <Target Name="SetupRestoreSrcPackagesInputsOutputs">
<ItemGroup> <ItemGroup>
<RestoreSrcPackagesInput Include="$(RepoRoot)/src/**/*.csproj" Exclude="$(RepoRoot)/src/**/%24projectName%24.csproj" /> <RestoreSrcPackagesInput Include="$(RepoRoot)/src/**/*.csproj" />
<RestoreSrcPackagesInput Remove="$(RepoRoot)/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj" Condition="'$(IncludeMSBuildSdkResolver)' == 'false'" /> <RestoreSrcPackagesInput Remove="%(RestoreSrcPackagesInput.Identity)" Condition="'%(RestoreSrcPackagesInput.Filename)' == 'Microsoft.DotNet.MSBuildSdkResolver' and '$(IncludeMSBuildSdkResolver)' != 'true'" />
</ItemGroup> </ItemGroup>
</Target> </Target>

2
build/package/Nupkg.targets
View file

@ -11,7 +11,7 @@
<ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName> <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver" > <ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver" Condition="'$(IncludeMSBuildSdkResolver)' == 'true'" >
<ProjectName>Microsoft.DotNet.MSBuildSdkResolver</ProjectName> <ProjectName>Microsoft.DotNet.MSBuildSdkResolver</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>