|
|
|
@ -65,6 +65,8 @@ |
|
|
|
|
|
|
|
<!-- Disable Paket restore under NCrunch build --> |
|
|
|
<PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled> |
|
|
|
|
|
|
|
<PaketIntermediateOutputPath Condition=" '$(PaketIntermediateOutputPath)' == '' ">$(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/'))</PaketIntermediateOutputPath> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')"> |
|
|
|
@ -105,8 +107,8 @@ |
|
|
|
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<!-- |
|
|
|
This value should match the version in the props generated by paket |
|
|
|
<!-- |
|
|
|
This value should match the version in the props generated by paket |
|
|
|
If they differ, this means we need to do a restore in order to ensure correct dependencies |
|
|
|
--> |
|
|
|
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' "> |
|
|
|
@ -115,18 +117,18 @@ |
|
|
|
|
|
|
|
<!-- Do a global restore if required --> |
|
|
|
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" /> |
|
|
|
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" /> |
|
|
|
|
|
|
|
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" /> |
|
|
|
|
|
|
|
<!-- Step 2 Detect project specific changes --> |
|
|
|
<ItemGroup> |
|
|
|
<MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks> |
|
|
|
<!-- Don't include all frameworks when msbuild explicitly asks for a single one --> |
|
|
|
<MyTargetFrameworks Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == '' " Include="$(TargetFrameworks)"></MyTargetFrameworks> |
|
|
|
<PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths> |
|
|
|
<PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(PaketIntermediateOutputPath)\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths> |
|
|
|
</ItemGroup> |
|
|
|
<Message Importance="low" Text="MyTargetFrameworks=@(MyTargetFrameworks) PaketResolvedFilePaths=@(PaketResolvedFilePaths)" /> |
|
|
|
<PropertyGroup> |
|
|
|
<PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath> |
|
|
|
<PaketReferencesCachedFilePath>$(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath> |
|
|
|
<!-- MyProject.fsproj.paket.references has the highest precedence --> |
|
|
|
<PaketOriginalReferencesFilePath>$(MSBuildProjectFullPath).paket.references</PaketOriginalReferencesFilePath> |
|
|
|
<!-- MyProject.paket.references --> |
|
|
|
@ -161,8 +163,8 @@ |
|
|
|
|
|
|
|
<!-- Step 3 Restore project specific stuff if required --> |
|
|
|
<Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" /> |
|
|
|
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" /> |
|
|
|
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" /> |
|
|
|
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --output-path "$(PaketIntermediateOutputPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" /> |
|
|
|
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --output-path "$(PaketIntermediateOutputPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" /> |
|
|
|
|
|
|
|
<!-- This shouldn't actually happen, but just to be sure. --> |
|
|
|
<PropertyGroup> |
|
|
|
@ -195,7 +197,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<PaketCliToolFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools</PaketCliToolFilePath> |
|
|
|
<PaketCliToolFilePath>$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools</PaketCliToolFilePath> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ReadLinesFromFile File="$(PaketCliToolFilePath)" > |
|
|
|
@ -214,12 +216,12 @@ |
|
|
|
|
|
|
|
<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964 |
|
|
|
<PropertyGroup> |
|
|
|
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile> |
|
|
|
<RestoreConfigFile>$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile> |
|
|
|
</PropertyGroup> --> |
|
|
|
|
|
|
|
</Target> |
|
|
|
|
|
|
|
<Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" > |
|
|
|
<Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).references')" > |
|
|
|
<PropertyGroup> |
|
|
|
<ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec> |
|
|
|
<DetectedMSBuildVersion>$(MSBuildVersion)</DetectedMSBuildVersion> |
|
|
|
@ -227,9 +229,9 @@ |
|
|
|
</PropertyGroup> |
|
|
|
</Target> |
|
|
|
|
|
|
|
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" > |
|
|
|
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).references')" > |
|
|
|
<ItemGroup> |
|
|
|
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/> |
|
|
|
<_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> |
|
|
|
<MSBuildMajorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[0])" /> |
|
|
|
<MSBuildMinorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[1])" /> |
|
|
|
</ItemGroup> |
|
|
|
@ -237,14 +239,16 @@ |
|
|
|
<PropertyGroup> |
|
|
|
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile> |
|
|
|
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec> |
|
|
|
<UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack> |
|
|
|
<UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack> |
|
|
|
<UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack> |
|
|
|
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' > '15' OR ('@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8') ">true</UseMSBuild15_9_Pack> |
|
|
|
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack> |
|
|
|
<UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack> |
|
|
|
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) ">true</UseMSBuild15_8_Pack> |
|
|
|
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack> |
|
|
|
<UseNuGet4_Pack>false</UseNuGet4_Pack> |
|
|
|
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) ">true</UseNuGet4_Pack> |
|
|
|
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath> |
|
|
|
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath> |
|
|
|
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack> |
|
|
|
<AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath> |
|
|
|
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
@ -258,6 +262,53 @@ |
|
|
|
</ConvertToAbsolutePath> |
|
|
|
|
|
|
|
<!-- Call Pack --> |
|
|
|
<PackTask Condition="$(UseMSBuild16_0_Pack)" |
|
|
|
PackItem="$(PackProjectInputFile)" |
|
|
|
PackageFiles="@(_PackageFiles)" |
|
|
|
PackageFilesToExclude="@(_PackageFilesToExclude)" |
|
|
|
PackageVersion="$(PackageVersion)" |
|
|
|
PackageId="$(PackageId)" |
|
|
|
Title="$(Title)" |
|
|
|
Authors="$(Authors)" |
|
|
|
Description="$(Description)" |
|
|
|
Copyright="$(Copyright)" |
|
|
|
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)" |
|
|
|
LicenseUrl="$(PackageLicenseUrl)" |
|
|
|
ProjectUrl="$(PackageProjectUrl)" |
|
|
|
IconUrl="$(PackageIconUrl)" |
|
|
|
ReleaseNotes="$(PackageReleaseNotes)" |
|
|
|
Tags="$(PackageTags)" |
|
|
|
DevelopmentDependency="$(DevelopmentDependency)" |
|
|
|
BuildOutputInPackage="@(_BuildOutputInPackage)" |
|
|
|
TargetPathsToSymbols="@(_TargetPathsToSymbols)" |
|
|
|
SymbolPackageFormat="symbols.nupkg" |
|
|
|
TargetFrameworks="@(_TargetFrameworks)" |
|
|
|
AssemblyName="$(AssemblyName)" |
|
|
|
PackageOutputPath="$(PackageOutputAbsolutePath)" |
|
|
|
IncludeSymbols="$(IncludeSymbols)" |
|
|
|
IncludeSource="$(IncludeSource)" |
|
|
|
PackageTypes="$(PackageType)" |
|
|
|
IsTool="$(IsTool)" |
|
|
|
RepositoryUrl="$(RepositoryUrl)" |
|
|
|
RepositoryType="$(RepositoryType)" |
|
|
|
SourceFiles="@(_SourceFiles->Distinct())" |
|
|
|
NoPackageAnalysis="$(NoPackageAnalysis)" |
|
|
|
MinClientVersion="$(MinClientVersion)" |
|
|
|
Serviceable="$(Serviceable)" |
|
|
|
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)" |
|
|
|
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)" |
|
|
|
NuspecOutputPath="$(AdjustedNuspecOutputPath)" |
|
|
|
IncludeBuildOutput="$(IncludeBuildOutput)" |
|
|
|
BuildOutputFolders="$(BuildOutputTargetFolder)" |
|
|
|
ContentTargetFolders="$(ContentTargetFolders)" |
|
|
|
RestoreOutputPath="$(RestoreOutputAbsolutePath)" |
|
|
|
NuspecFile="$(NuspecFileAbsolutePath)" |
|
|
|
NuspecBasePath="$(NuspecBasePath)" |
|
|
|
NuspecProperties="$(NuspecProperties)" |
|
|
|
PackageLicenseFile="$(PackageLicenseFile)" |
|
|
|
PackageLicenseExpression="$(PackageLicenseExpression)" |
|
|
|
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" /> |
|
|
|
|
|
|
|
<PackTask Condition="$(UseMSBuild15_9_Pack)" |
|
|
|
PackItem="$(PackProjectInputFile)" |
|
|
|
PackageFiles="@(_PackageFiles)" |
|
|
|
|
Christoph Ruegg
7 years ago