|
14 | 14 | <EmscriptenPkgVersion>$(MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion)</EmscriptenPkgVersion>
|
15 | 15 | </PropertyGroup>
|
16 | 16 |
|
17 |
| - <ItemGroup Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'"> |
| 17 | + <ItemGroup> |
18 | 18 | <PackageReference Include="runtime.$(PackageTargetOS)-$(TargetArchitecture).Microsoft.NETCore.Runtime.Wasm.LLVM.Transport"
|
19 | 19 | Version="$(LLVMPkgVersion)"
|
20 | 20 | PackageArch="$(TargetArchitecture)"
|
|
55 | 55 | <PackageReference Include="@(_PackageReferenceDeduplicated->Distinct())" />
|
56 | 56 | </ItemGroup>
|
57 | 57 |
|
58 |
| - <Target Name="CopyBinaryen" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild"> |
| 58 | + <Target Name="CopyBinaryen" BeforeTargets="ReallyBuild"> |
59 | 59 | <Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Binaryen to $(BinaryenDir)" />
|
60 | 60 | <Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Binaryen to $(HostBinaryenDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
|
61 | 61 | <ItemGroup>
|
|
74 | 74 | </Copy>
|
75 | 75 | </Target>
|
76 | 76 |
|
77 |
| - <Target Name="CopyNode" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild"> |
| 77 | + <Target Name="CopyNode" BeforeTargets="ReallyBuild"> |
78 | 78 | <Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Node to $(NodeDir)" />
|
79 | 79 | <Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Node to $(HostNodeDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
|
80 | 80 | <ItemGroup>
|
|
93 | 93 | </Copy>
|
94 | 94 | </Target>
|
95 | 95 |
|
96 |
| - <Target Name="CopyPython" BeforeTargets="ReallyBuild" Condition="'$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'"> |
| 96 | + <Target Name="CopyPython" BeforeTargets="ReallyBuild" Condition="'$(PackageHostOS)' != 'linux'"> |
97 | 97 | <Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Python to $(PythonDir)" />
|
98 | 98 | <Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Python to $(HostPythonDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
|
99 | 99 | <ItemGroup>
|
|
112 | 112 | </Copy>
|
113 | 113 | </Target>
|
114 | 114 |
|
115 |
| - <Target Name="CopyLLVM" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild"> |
| 115 | + <Target Name="CopyLLVM" BeforeTargets="ReallyBuild"> |
116 | 116 | <Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) LLVM to $(LLVMDir)" />
|
117 | 117 | <Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) LLVM to $(HostLLVMDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
|
118 | 118 | <ItemGroup>
|
|
131 | 131 | </Copy>
|
132 | 132 | </Target>
|
133 | 133 |
|
134 |
| - <Target Name="CopyEmscripten" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild"> |
| 134 | + <Target Name="CopyEmscripten" BeforeTargets="ReallyBuild"> |
135 | 135 | <Message Importance="High" Text="** Copying Emscripten to $(EmscriptenDir)" />
|
136 | 136 | <ItemGroup>
|
137 | 137 | <EmscriptenPkgFiles Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**"
|
|
143 | 143 | </Copy>
|
144 | 144 | </Target>
|
145 | 145 |
|
146 |
| - <Target Name="ReallyBuild" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="Build"> |
| 146 | + <Target Name="ReallyBuild" BeforeTargets="Build"> |
147 | 147 | <Error Condition="'$(PackageRID)' == ''" Text="PackageRID needs to be specified, e.g. 'osx-x64'!" />
|
148 | 148 |
|
149 | 149 | <PropertyGroup>
|
|
367 | 367 |
|
368 | 368 | <Target Name="ReallyPack" DependsOnTargets="Build" BeforeTargets="Pack">
|
369 | 369 | <Message Importance="High" Text="Creating nuget packages..." />
|
370 |
| - <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Node\Microsoft.NET.Runtime.Emscripten.Node.pkgproj" Targets="Build" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" /> |
371 |
| - <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Python\Microsoft.NET.Runtime.Emscripten.Python.pkgproj" Targets="Build" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true' and '$(UsesPythonFromEmsdk)' == 'true'" /> |
372 |
| - <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk\Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj" Targets="Build" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" /> |
373 |
| - <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Cache\Microsoft.NET.Runtime.Emscripten.Cache.pkgproj" Targets="Build" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" /> |
| 370 | + <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Node\Microsoft.NET.Runtime.Emscripten.Node.pkgproj" Targets="Build" /> |
| 371 | + <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Python\Microsoft.NET.Runtime.Emscripten.Python.pkgproj" Targets="Build" Condition="'$(UsesPythonFromEmsdk)' == 'true'" /> |
| 372 | + <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk\Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj" Targets="Build" /> |
| 373 | + <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Cache\Microsoft.NET.Runtime.Emscripten.Cache.pkgproj" Targets="Build" /> |
374 | 374 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.Current.Manifest\Microsoft.NET.Workload.Emscripten.Current.Manifest.pkgproj"
|
375 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 375 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
376 | 376 | Targets="Build"
|
377 | 377 | Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
|
378 | 378 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.Current.Manifest\Microsoft.NET.Workload.Emscripten.Current.Manifest.pkgproj"
|
379 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 379 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
380 | 380 | Targets="Build"
|
381 | 381 | Properties="IsUnversionedManifest=true" />
|
382 | 382 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net6.Manifest\Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj"
|
383 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 383 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
384 | 384 | Targets="Build"
|
385 | 385 | Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
|
386 | 386 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net7.Manifest\Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj"
|
387 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 387 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
388 | 388 | Targets="Build"
|
389 | 389 | Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
|
390 | 390 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net8.Manifest\Microsoft.NET.Workload.Emscripten.net8.Manifest.pkgproj"
|
391 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 391 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
392 | 392 | Targets="Build"
|
393 | 393 | Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
|
394 | 394 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net9.Manifest\Microsoft.NET.Workload.Emscripten.net9.Manifest.pkgproj"
|
395 |
| - Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64') or '$(ForceBuildManifestOnly)' == 'true')" |
| 395 | + Condition="'$(DotNetBuild)' != 'true' and ('$(AssetManifestOS)' == '' or ('$(AssetManifestOS)' == 'win' and '$(TargetArchitecture)' == 'x64'))" |
396 | 396 | Targets="Build"
|
397 | 397 | Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
|
398 | 398 | <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk.Internal\Microsoft.NET.Runtime.Emscripten.Sdk.Internal.pkgproj" Targets="Build"
|
|
0 commit comments