diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-09-24 15:49:15 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-09-24 15:49:15 -0700 |
| commit | 5d6c31d1f5e0b8a46f41d4f321e878adba156bb2 (patch) | |
| tree | 0efc8b01fee4254b616a492e3191a36c4fb6f62a | |
| parent | feea62d5bd1f90bb012cb7cf2c84c9703f6568b2 (diff) | |
| download | wix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.tar.gz wix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.tar.bz2 wix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.zip | |
Correctly name NuGet .props file
| -rw-r--r-- | src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 | ||||
| -rw-r--r-- | src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj | 2 | ||||
| -rw-r--r-- | src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec | 2 | ||||
| -rw-r--r-- | src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props (renamed from src/WixToolset.BuildTasks/redirects/wix.props) | 0 |
4 files changed, 2 insertions, 3 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index ce65ea41..10dce157 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" /> | 17 | <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 18 | <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> | 18 | <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 19 | <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" /> | ||
| 20 | <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" /> | 19 | <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 21 | <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> | 20 | <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 22 | <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> | 21 | <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> |
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj index 613c6b88..687e8955 100644 --- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj +++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " /> | 20 | <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " /> |
| 21 | 21 | ||
| 22 | <PropertyGroup> | 22 | <PropertyGroup> |
| 23 | <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties> | 23 | <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> |
| 24 | </PropertyGroup> | 24 | </PropertyGroup> |
| 25 | </Target> | 25 | </Target> |
| 26 | </Project> | 26 | </Project> |
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec index 5879b7a5..5b81d615 100644 --- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec +++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | </metadata> | 11 | </metadata> |
| 12 | 12 | ||
| 13 | <files> | 13 | <files> |
| 14 | <file src="redirects\wix.props" target="build" /> | 14 | <file src="$projectFolder$$id$.props" target="build" /> |
| 15 | 15 | ||
| 16 | <file src="redirects\wix.targets" target="msbuild" /> | 16 | <file src="redirects\wix.targets" target="msbuild" /> |
| 17 | <file src="redirects\wix.ca.targets" target="msbuild" /> | 17 | <file src="redirects\wix.ca.targets" target="msbuild" /> |
diff --git a/src/WixToolset.BuildTasks/redirects/wix.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props index 7448d192..7448d192 100644 --- a/src/WixToolset.BuildTasks/redirects/wix.props +++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props | |||