Skip to content

Commit b12cad8

Browse files
authored
Remove source-build related code (#1169)
* Remove source-build related code Fixes dotnet/source-build#5014 We can do this for emsdk already since emsdk doesn't build in source-build anymore. * Fix missing quotation mark in CopyPython target condition
1 parent 442d43a commit b12cad8

File tree

3 files changed

+17
-36
lines changed

3 files changed

+17
-36
lines changed

eng/SourceBuildPrebuiltBaseline.xml

-7
This file was deleted.

eng/Version.Details.xml

-12
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,5 @@
263263
<Uri>https://github.com/dotnet/arcade</Uri>
264264
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
265265
</Dependency>
266-
<!-- Intermediate is necessary for source build. -->
267-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25212.1">
268-
<Uri>https://github.com/dotnet/arcade</Uri>
269-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
270-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
271-
</Dependency>
272-
<!-- Intermediate is necessary for source build. -->
273-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.621001">
274-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
275-
<Sha>1df7df81ac783e63aa7fbccb0232ad20fb128b15</Sha>
276-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
277-
</Dependency>
278266
</ToolsetDependencies>
279267
</Dependencies>

eng/emsdk.proj

+17-17
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<EmscriptenPkgVersion>$(MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion)</EmscriptenPkgVersion>
1515
</PropertyGroup>
1616

17-
<ItemGroup Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
17+
<ItemGroup>
1818
<PackageReference Include="runtime.$(PackageTargetOS)-$(TargetArchitecture).Microsoft.NETCore.Runtime.Wasm.LLVM.Transport"
1919
Version="$(LLVMPkgVersion)"
2020
PackageArch="$(TargetArchitecture)"
@@ -55,7 +55,7 @@
5555
<PackageReference Include="@(_PackageReferenceDeduplicated->Distinct())" />
5656
</ItemGroup>
5757

58-
<Target Name="CopyBinaryen" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild">
58+
<Target Name="CopyBinaryen" BeforeTargets="ReallyBuild">
5959
<Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Binaryen to $(BinaryenDir)" />
6060
<Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Binaryen to $(HostBinaryenDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
6161
<ItemGroup>
@@ -74,7 +74,7 @@
7474
</Copy>
7575
</Target>
7676

77-
<Target Name="CopyNode" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild">
77+
<Target Name="CopyNode" BeforeTargets="ReallyBuild">
7878
<Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Node to $(NodeDir)" />
7979
<Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Node to $(HostNodeDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
8080
<ItemGroup>
@@ -93,7 +93,7 @@
9393
</Copy>
9494
</Target>
9595

96-
<Target Name="CopyPython" BeforeTargets="ReallyBuild" Condition="'$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
96+
<Target Name="CopyPython" BeforeTargets="ReallyBuild" Condition="'$(PackageHostOS)' != 'linux'">
9797
<Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) Python to $(PythonDir)" />
9898
<Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) Python to $(HostPythonDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
9999
<ItemGroup>
@@ -112,7 +112,7 @@
112112
</Copy>
113113
</Target>
114114

115-
<Target Name="CopyLLVM" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild">
115+
<Target Name="CopyLLVM" BeforeTargets="ReallyBuild">
116116
<Message Importance="High" Text="** Copying $(PackageTargetOS)-$(TargetArchitecture) LLVM to $(LLVMDir)" />
117117
<Message Importance="High" Text="** Copying $(PackageHostOS)-$(BuildArchitecture) LLVM to $(HostLLVMDir)" Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(PackageTargetOS)' != '$(PackageHostOS)'" />
118118
<ItemGroup>
@@ -131,7 +131,7 @@
131131
</Copy>
132132
</Target>
133133

134-
<Target Name="CopyEmscripten" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="ReallyBuild">
134+
<Target Name="CopyEmscripten" BeforeTargets="ReallyBuild">
135135
<Message Importance="High" Text="** Copying Emscripten to $(EmscriptenDir)" />
136136
<ItemGroup>
137137
<EmscriptenPkgFiles Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**"
@@ -143,7 +143,7 @@
143143
</Copy>
144144
</Target>
145145

146-
<Target Name="ReallyBuild" Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" BeforeTargets="Build">
146+
<Target Name="ReallyBuild" BeforeTargets="Build">
147147
<Error Condition="'$(PackageRID)' == ''" Text="PackageRID needs to be specified, e.g. 'osx-x64'!" />
148148

149149
<PropertyGroup>
@@ -367,32 +367,32 @@
367367

368368
<Target Name="ReallyPack" DependsOnTargets="Build" BeforeTargets="Pack">
369369
<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" />
374374
<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'))"
376376
Targets="Build"
377377
Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
378378
<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'))"
380380
Targets="Build"
381381
Properties="IsUnversionedManifest=true" />
382382
<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'))"
384384
Targets="Build"
385385
Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
386386
<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'))"
388388
Targets="Build"
389389
Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
390390
<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'))"
392392
Targets="Build"
393393
Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
394394
<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'))"
396396
Targets="Build"
397397
Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" />
398398
<MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk.Internal\Microsoft.NET.Runtime.Emscripten.Sdk.Internal.pkgproj" Targets="Build"

0 commit comments

Comments
 (0)