Skip to content

Commit 6c9b85d

Browse files
committed
NuProj pkg should work with dotnet build on win32
1 parent 9b2b980 commit 6c9b85d

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

src/Nerdbank.GitVersioning.NuGet/Nerdbank.GitVersioning.NuGet.nuproj

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<Content Include="buildCrossTargeting\NerdBank.GitVersioning.targets" />
42-
<Content Include="build\dotnet\Nerdbank.GitVersioning.targets" />
4342
<Content Include="build\NerdBank.GitVersioning.targets" />
44-
<Content Include="build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets" />
4543
<Content Include="tools\Get-Version.ps1" />
4644
<Content Include="tools\Get-CommitId.ps1" />
4745
<Content Include="tools\Create-VersionFile.ps1" />
@@ -81,4 +79,33 @@
8179
</ItemGroup>
8280
<Copy SourceFiles="@(NpmPackageLayout)" DestinationFiles="@(NpmPackageLayout->'%(TargetPath)')" />
8381
</Target>
82+
<Target Name="FixCrossTargetingProjectReferences" AfterTargets="ResolveProjectReferences">
83+
<ItemGroup>
84+
<CrossTargetProjects Include="@(_MSBuildProjectReferenceExistent)">
85+
<SetPlatform>TargetFramework=net45;%(_MSBuildProjectReferenceExistent.SetPlatform)</SetPlatform>
86+
<TargetSubdirectory>MSBuildFull</TargetSubdirectory>
87+
</CrossTargetProjects>
88+
<CrossTargetProjects Include="@(_MSBuildProjectReferenceExistent)">
89+
<SetPlatform>TargetFramework=netstandard1.3;%(_MSBuildProjectReferenceExistent.SetPlatform)</SetPlatform>
90+
<TargetSubdirectory>MSBuildCore</TargetSubdirectory>
91+
</CrossTargetProjects>
92+
<_MSBuildProjectReferenceExistent Remove="@(CrossTargetProjects)" />
93+
<_MSBuildProjectReferenceExistent Include="@(CrossTargetProjects)" />
94+
</ItemGroup>
95+
</Target>
96+
<Target Name="SkipFrameworkAssemblies" AfterTargets="GetPackageFiles">
97+
<ItemGroup>
98+
<PackageFile Remove="@(PackageFile)" Condition="
99+
!$([System.String]::new('%(TargetPath)').StartsWith('build\lib\')) and
100+
'%(FileName)' != 'NerdBank.GitVersioning' and
101+
'%(FileName)' != 'NerdBank.GitVersioning.Tasks' and
102+
'%(FileName)' != 'LibGit2Sharp' and
103+
'%(FileName)' != 'Validation' and
104+
'%(FileName)' != 'Newtonsoft.Json' and
105+
'%(FileName)' != 'PInvoke.Kernel32' and
106+
'%(FileName)' != 'PInvoke.MsCorEE' and
107+
'%(FileName)' != 'PInvoke.Windows.Core'
108+
" />
109+
</ItemGroup>
110+
</Target>
84111
</Project>

src/Nerdbank.GitVersioning.NuGet/build/dotnet/Nerdbank.GitVersioning.targets

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/Nerdbank.GitVersioning.NuGet/build/portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS/Nerdbank.GitVersioning.targets

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)