mirror of https://github.com/kdl-org/kdl.git
Change strings in nuget example to raw where needed.
This commit is contained in:
parent
4b20446ace
commit
547cdd3a99
|
|
@ -4,7 +4,7 @@ Project {
|
||||||
IsCommandLinePackage true
|
IsCommandLinePackage true
|
||||||
}
|
}
|
||||||
|
|
||||||
Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\build\common.props"
|
Import Project=r"$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\build\common.props"
|
||||||
Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk"
|
Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk"
|
||||||
Import Project="ilmerge.props"
|
Import Project="ilmerge.props"
|
||||||
|
|
||||||
|
|
@ -32,10 +32,10 @@ Project {
|
||||||
|
|
||||||
Target Name="CreateCommandlineNupkg" {
|
Target Name="CreateCommandlineNupkg" {
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
TfmSpecificPackageFile Include="$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe" {
|
TfmSpecificPackageFile Include=r"$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe" {
|
||||||
PackagePath "tools/"
|
PackagePath "tools/"
|
||||||
}
|
}
|
||||||
TfmSpecificPackageFile Include="$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.pdb" {
|
TfmSpecificPackageFile Include=r"$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.pdb" {
|
||||||
PackagePath "tools/"
|
PackagePath "tools/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -83,14 +83,14 @@ Project {
|
||||||
Reference Include="System.Xml"
|
Reference Include="System.Xml"
|
||||||
Reference Include="System.Xml.Linq"
|
Reference Include="System.Xml.Linq"
|
||||||
Reference Include="NuGet.Core" {
|
Reference Include="NuGet.Core" {
|
||||||
HintPath "$(SolutionPackagesFolder)nuget.core\2.14.0-rtm-832\lib\net40-Client\NuGet.Core.dll"
|
HintPath r"$(SolutionPackagesFolder)nuget.core\2.14.0-rtm-832\lib\net40-Client\NuGet.Core.dll"
|
||||||
Aliases "CoreV2"
|
Aliases "CoreV2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop"
|
PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop"
|
||||||
ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.PackageManagement\NuGet.PackageManagement.csproj"
|
ProjectReference Include=r"$(NuGetCoreSrcDirectory)NuGet.PackageManagement\NuGet.PackageManagement.csproj"
|
||||||
ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Build.Tasks\NuGet.Build.Tasks.csproj"
|
ProjectReference Include=r"$(NuGetCoreSrcDirectory)NuGet.Build.Tasks\NuGet.Build.Tasks.csproj"
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
|
|
@ -116,7 +116,7 @@ Project {
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
EmbeddedResource Include="$(NuGetCoreSrcDirectory)NuGet.Build.Tasks\NuGet.targets" {
|
EmbeddedResource Include=r"$(NuGetCoreSrcDirectory)NuGet.Build.Tasks\NuGet.targets" {
|
||||||
Link "NuGet.targets"
|
Link "NuGet.targets"
|
||||||
SubType "Designer"
|
SubType "Designer"
|
||||||
}
|
}
|
||||||
|
|
@ -133,9 +133,9 @@ Project {
|
||||||
ExpectedLocalizedArtifactCount 0 Condition="'$(ExpectedLocalizedArtifactCount)' == ''"
|
ExpectedLocalizedArtifactCount 0 Condition="'$(ExpectedLocalizedArtifactCount)' == ''"
|
||||||
}
|
}
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
BuildArtifacts Include="$(OutputPath)\*.dll" Exclude="@(MergeExclude)"
|
BuildArtifacts Include=r"$(OutputPath)\*.dll" Exclude="@(MergeExclude)"
|
||||||
// NuGet.exe needs all NuGet.Commands.resources.dll merged in
|
// NuGet.exe needs all NuGet.Commands.resources.dll merged in
|
||||||
LocalizedArtifacts Include="$(ArtifactsDirectory)\NuGet.Commands\**\$(NETFXTargetFramework)\**\*.resources.dll"
|
LocalizedArtifacts Include=r"$(ArtifactsDirectory)\NuGet.Commands\**\$(NETFXTargetFramework)\**\*.resources.dll"
|
||||||
}
|
}
|
||||||
Error Text="Build dependencies are inconsistent with mergeinclude specified in ilmerge.props" \
|
Error Text="Build dependencies are inconsistent with mergeinclude specified in ilmerge.props" \
|
||||||
Condition="'@(BuildArtifacts->Count())' != '@(MergeInclude->Count())'"
|
Condition="'@(BuildArtifacts->Count())' != '@(MergeInclude->Count())'"
|
||||||
|
|
@ -143,7 +143,7 @@ Project {
|
||||||
Condition="'@(LocalizedArtifacts->Count())' != '$(ExpectedLocalizedArtifactCount)'"
|
Condition="'@(LocalizedArtifacts->Count())' != '$(ExpectedLocalizedArtifactCount)'"
|
||||||
PropertyGroup {
|
PropertyGroup {
|
||||||
PathToBuiltNuGetExe "$(OutputPath)NuGet.exe"
|
PathToBuiltNuGetExe "$(OutputPath)NuGet.exe"
|
||||||
IlmergeCommand "$(ILMergeExePath) /lib:$(OutputPath) /out:$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe @(MergeAllowDup -> '/allowdup:%(Identity)', ' ') /log:$(OutputPath)IlMergeLog.txt"
|
IlmergeCommand r"$(ILMergeExePath) /lib:$(OutputPath) /out:$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe @(MergeAllowDup -> '/allowdup:%(Identity)', ' ') /log:$(OutputPath)IlMergeLog.txt"
|
||||||
IlmergeCommand Condition="Exists($(MS_PFX_PATH))" "$(IlmergeCommand) /delaysign /keyfile:$(MS_PFX_PATH)"
|
IlmergeCommand Condition="Exists($(MS_PFX_PATH))" "$(IlmergeCommand) /delaysign /keyfile:$(MS_PFX_PATH)"
|
||||||
// LocalizedArtifacts need fullpath, since there will be duplicate file names
|
// LocalizedArtifacts need fullpath, since there will be duplicate file names
|
||||||
IlmergeCommand "$(IlmergeCommand) $(PathToBuiltNuGetExe) @(BuildArtifacts->'%(filename)%(extension)', ' ') @(LocalizedArtifacts->'%(fullpath)', ' ')"
|
IlmergeCommand "$(IlmergeCommand) $(PathToBuiltNuGetExe) @(BuildArtifacts->'%(filename)%(extension)', ' ') @(LocalizedArtifacts->'%(fullpath)', ' ')"
|
||||||
|
|
@ -160,7 +160,7 @@ Project {
|
||||||
|
|
||||||
Target Name="GetSigningInputs" Returns="@(DllsToSign)" {
|
Target Name="GetSigningInputs" Returns="@(DllsToSign)" {
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
DllsToSign Include="$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe" {
|
DllsToSign Include=r"$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe" {
|
||||||
StrongName "MsSharedLib72"
|
StrongName "MsSharedLib72"
|
||||||
Authenticode "Microsoft400"
|
Authenticode "Microsoft400"
|
||||||
}
|
}
|
||||||
|
|
@ -169,8 +169,8 @@ Project {
|
||||||
|
|
||||||
Target Name="GetSymbolsToIndex" Returns="@(SymbolsToIndex)" {
|
Target Name="GetSymbolsToIndex" Returns="@(SymbolsToIndex)" {
|
||||||
ItemGroup {
|
ItemGroup {
|
||||||
SymbolsToIndex Include="$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe"
|
SymbolsToIndex Include=r"$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.exe"
|
||||||
SymbolsToIndex Include="$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.pdb"
|
SymbolsToIndex Include=r"$(ArtifactsDirectory)$(VsixOutputDirName)\NuGet.pdb"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue