diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-01-09 05:42:43 +0300 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-01-09 06:15:00 +0300 |
| commit | 52cf315e05fe595b53fdff9ef9d58de8b8b9ce56 (patch) | |
| tree | 24ed03d7323fdc9bc2ff40a10e273bfe4c045cad /src/packaging | |
| parent | 01cdef0f099e507230e4bfa26e576dfd62a61306 (diff) | |
Fix issue 612
If Bin folder is a symlink, then nuget package creation fails due to
relative path constructs.
The fix is to specify BasePath for nuget package creation, to be the
repo root path, and construct nuspec file entries relative to it.
Diffstat (limited to 'src/packaging')
| -rw-r--r-- | src/packaging/packages.targets | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets index 73c92402d..42f06b0e4 100644 --- a/src/packaging/packages.targets +++ b/src/packaging/packages.targets @@ -43,14 +43,14 @@ <ILCompilerFiles Include="ILCompiler.DependencyAnalysisFramework.dll" /> <ILCompilerFiles Include="ILCompiler.TypeSystem.dll" /> <ILCompilerBinPlace Include="@(ILCompilerFiles)"> - <Text><![CDATA[ <file src="../%(Identity)" target="runtimes/any/lib/dotnet/%(Identity)" /> ]]></Text> + <Text><![CDATA[ <file src="$(RelativeProductBinDir)/%(Identity)" target="runtimes/any/lib/dotnet/%(Identity)" /> ]]></Text> </ILCompilerBinPlace> <ILCompilerNativeFiles Include="jitinterface.dll" Condition="'$(OSGroup)'=='Windows_NT'" /> <ILCompilerNativeFiles Include="jitinterface.so" Condition="'$(OSGroup)'=='Linux'" /> <ILCompilerNativeFiles Include="jitinterface.dylib" Condition="'$(OSGroup)'=='OSX'" /> <ILCompilerBinPlace Include="@(ILCompilerNativeFiles)"> - <Text><![CDATA[ <file src="../%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Identity)" /> ]]></Text> + <Text><![CDATA[ <file src="$(RelativeProductBinDir)/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Identity)" /> ]]></Text> </ILCompilerBinPlace> <!-- IL.Compiler.SDK target files --> @@ -77,13 +77,13 @@ <ILCompilerSdkFilesManaged Include="System.Private.Threading" /> <ILCompilerSdkBinPlace Include="@(ILCompilerSdkFiles)"> - <Text><![CDATA[ <file src="../lib/$(LibPrefix)%(Identity).$(StaticLibExt)" target="runtimes/$(NuPkgRid)/native/sdk/$(LibPrefix)%(Identity).$(StaticLibExt)" /> ]]></Text> + <Text><![CDATA[ <file src="$(RelativeProductBinDir)/lib/$(LibPrefix)%(Identity).$(StaticLibExt)" target="runtimes/$(NuPkgRid)/native/sdk/$(LibPrefix)%(Identity).$(StaticLibExt)" /> ]]></Text> </ILCompilerSdkBinPlace> <ILCompilerSdkBinPlace Include="@(ILCompilerSdkFilesManaged)"> - <Text><![CDATA[ <file src="../%(Identity).dll" target="runtimes/$(NuPkgRid)/native/sdk/%(Identity).dll" /> ]]></Text> + <Text><![CDATA[ <file src="$(RelativeProductBinDir)/%(Identity).dll" target="runtimes/$(NuPkgRid)/native/sdk/%(Identity).dll" /> ]]></Text> </ILCompilerSdkBinPlace> <ILCompilerSdkBinPlace Include="@(ILCompilerSdkCppCodegenFiles)"> - <Text><![CDATA[ <file src="../../../../src/%(Identity)" target="runtimes/$(NuPkgRid)/native/inc/%(Filename)%(Extension)" /> ]]></Text> + <Text><![CDATA[ <file src="src/%(Identity)" target="runtimes/$(NuPkgRid)/native/inc/%(Filename)%(Extension)" /> ]]></Text> </ILCompilerSdkBinPlace> <!-- ILCompiler nuspec file --> @@ -196,7 +196,7 @@ %(NuSpecPackageMetadata) </metadata> <files> - <file src="%(RedirPackage).runtime.json" target="runtime.json"></file> + <file src="$(RelativeProductBinDir)/.nuget/%(RedirPackage).runtime.json" target="runtime.json"></file> </files> </package> ]]> @@ -232,7 +232,7 @@ <Stage0NuSpecs Include="%(NuSpecCollection.RedirFile)" Condition="'%(NuSpecCollection.Stage)'=='0'" /> </ItemGroup> - <Exec Command=""$(NuGetToolPath)" pack "%(Stage0NuSpecs.Identity)" -NoPackageAnalysis -NoDefaultExcludes -OutputDirectory "$(ProductPackageDir)"" /> + <Exec Command=""$(NuGetToolPath)" pack "%(Stage0NuSpecs.Identity)" -NoPackageAnalysis -NoDefaultExcludes -BasePath "$(RepoPath)" -OutputDirectory "$(ProductPackageDir)"" /> <PropertyGroup> <Stage0ProjectDir>$(ProductPackageDir)stage0/</Stage0ProjectDir> @@ -278,7 +278,7 @@ <Stage1NuSpecs Include="%(NuSpecCollection.RedirFile)" Condition="'%(NuSpecCollection.Stage)'=='1'" /> </ItemGroup> - <Exec Command=""$(NuGetToolPath)" pack "%(Stage1NuSpecs.Identity)" -NoPackageAnalysis -NoDefaultExcludes -OutputDirectory "$(ProductPackageDir)"" /> + <Exec Command=""$(NuGetToolPath)" pack "%(Stage1NuSpecs.Identity)" -NoPackageAnalysis -NoDefaultExcludes -BasePath "$(RepoPath)" -OutputDirectory "$(ProductPackageDir)"" /> <PropertyGroup> <Stage1ProjectDir>$(ProductPackageDir)stage1/</Stage1ProjectDir> |