Remove DotNetBuildFromSource inside the orchestrator (#18402)
This commit is contained in:
parent
4a54e209f5
commit
a880230afd
20 changed files with 47 additions and 51 deletions
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_SuppressSdkImports Condition="'$(DotNetBuildFromSource)' == 'true'">true</_SuppressSdkImports>
|
<_SuppressSdkImports Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</_SuppressSdkImports>
|
||||||
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
|
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
|
||||||
<DotNetBuildOrchestrator>true</DotNetBuildOrchestrator>
|
<DotNetBuildOrchestrator>true</DotNetBuildOrchestrator>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -118,10 +118,8 @@
|
||||||
<IsShipping>false</IsShipping>
|
<IsShipping>false</IsShipping>
|
||||||
<!-- It's not unusual to build with a preview SDK -->
|
<!-- It's not unusual to build with a preview SDK -->
|
||||||
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
|
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
|
||||||
<!-- Builds from the VMR are by definition vertical builds. -->
|
<!-- By default, the VMR builds with online sources when not building source-only. -->
|
||||||
<DotNetBuildVertical Condition="'$(DotNetBuildVertical)' == '' and '$(DotNetBuildFromSource)' != 'true'">true</DotNetBuildVertical>
|
<DotNetBuildWithOnlineSources Condition="'$(DotNetBuildWithOnlineSources)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</DotNetBuildWithOnlineSources>
|
||||||
<!-- By default, the VMR builds with online sources. -->
|
|
||||||
<DotNetBuildWithOnlineSources Condition="'$(DotNetBuildWithOnlineSources)' == '' and '$(DotNetBuildVertical)' == 'true'">true</DotNetBuildWithOnlineSources>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
@ -157,8 +155,8 @@
|
||||||
|
|
||||||
<!-- When SB mode, the initial arcade is unzipped to a the "ArcadeBootStrap" dir.
|
<!-- When SB mode, the initial arcade is unzipped to a the "ArcadeBootStrap" dir.
|
||||||
When running in VBPOC, the bootstrap package is the arcade restored at the beginning of the build. -->
|
When running in VBPOC, the bootstrap package is the arcade restored at the beginning of the build. -->
|
||||||
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'ArcadeBootstrapPackage'))</ArcadeBootstrapPackageDir>
|
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildSourceOnly)' == 'true'">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'ArcadeBootstrapPackage'))</ArcadeBootstrapPackageDir>
|
||||||
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildFromSource)' != 'true'">$(NuGetPackageRoot)</ArcadeBootstrapPackageDir>
|
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(NuGetPackageRoot)</ArcadeBootstrapPackageDir>
|
||||||
|
|
||||||
<!-- Shared output and intermediate output path folders that are architecture and configuration specific. -->
|
<!-- Shared output and intermediate output path folders that are architecture and configuration specific. -->
|
||||||
<SharedOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', '$(TargetArchitecture)', '$(Configuration)'))</SharedOutputPath>
|
<SharedOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', '$(TargetArchitecture)', '$(Configuration)'))</SharedOutputPath>
|
||||||
|
|
|
@ -19,6 +19,6 @@
|
||||||
StopOnFirstFailure="true" />
|
StopOnFirstFailure="true" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Import Project="$(RepositoryEngineeringDir)build.sourcebuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<Import Project="$(RepositoryEngineeringDir)build.sourcebuild.targets" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -119,7 +119,7 @@ while [[ $# > 0 ]]; do
|
||||||
# Source-only settings
|
# Source-only settings
|
||||||
-source-only|-so)
|
-source-only|-so)
|
||||||
sourceOnly=true
|
sourceOnly=true
|
||||||
properties="$properties /p:DotNetBuildFromSource=true /p:DotNetBuildSourceOnly=true"
|
properties="$properties /p:DotNetBuildSourceOnly=true"
|
||||||
;;
|
;;
|
||||||
-online)
|
-online)
|
||||||
properties="$properties /p:DotNetBuildWithOnlineSources=true"
|
properties="$properties /p:DotNetBuildWithOnlineSources=true"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
PoisonPrebuiltPackages" />
|
PoisonPrebuiltPackages" />
|
||||||
|
|
||||||
<Target Name="UnpackTarballs"
|
<Target Name="UnpackTarballs"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'"
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'"
|
||||||
Inputs="$(MSBuildProjectFullPath)"
|
Inputs="$(MSBuildProjectFullPath)"
|
||||||
Outputs="$(BaseIntermediateOutputPath)UnpackTarballs.complete" >
|
Outputs="$(BaseIntermediateOutputPath)UnpackTarballs.complete" >
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
@ -127,7 +127,7 @@
|
||||||
|
|
||||||
<!-- Extract Arcade prebuilt package into the bootstrap folder and prepare it. -->
|
<!-- Extract Arcade prebuilt package into the bootstrap folder and prepare it. -->
|
||||||
<Target Name="ExtractToolPackage"
|
<Target Name="ExtractToolPackage"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'"
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'"
|
||||||
DependsOnTargets="UnpackTarballs"
|
DependsOnTargets="UnpackTarballs"
|
||||||
Inputs="$(MSBuildProjectFullPath)"
|
Inputs="$(MSBuildProjectFullPath)"
|
||||||
Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
|
Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
|
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RestoreSources Condition="'$(DotNetBuildFromSource)' == 'true'">$(ReferencePackagesDir);$(PrebuiltPackagesPath);$(PrebuiltSourceBuiltPackagesPath)</RestoreSources>
|
<RestoreSources Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(ReferencePackagesDir);$(PrebuiltPackagesPath);$(PrebuiltSourceBuiltPackagesPath)</RestoreSources>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|
|
@ -61,11 +61,11 @@
|
||||||
<BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) /p:CrossBuild=$(CrossBuild)</BuildArgs>
|
<BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) /p:CrossBuild=$(CrossBuild)</BuildArgs>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DotNetBuildVertical)' == 'true'">
|
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||||
<BuildArgs>$(BuildArgs) /p:ArcadeBuildVertical=true</BuildArgs>
|
<BuildArgs>$(BuildArgs) /p:ArcadeBuildVertical=true</BuildArgs>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<BuildArgs>$(BuildArgs) /p:ArcadeBuildFromSource=true</BuildArgs>
|
<BuildArgs>$(BuildArgs) /p:ArcadeBuildFromSource=true</BuildArgs>
|
||||||
<BuildArgs>$(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"</BuildArgs>
|
<BuildArgs>$(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"</BuildArgs>
|
||||||
<BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
|
<BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
|
||||||
|
@ -139,11 +139,9 @@
|
||||||
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
|
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- VBPOC - I'm not sure about this. Some of this may be needed for VB, but I'm not sure why some pieces like
|
|
||||||
DotNetBuildFromSource are in there for source-build at all. -->
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EnvironmentVariables Include="DotNetBuildFromSource=true" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<EnvironmentVariables Include="DotNetBuildFromSource=true" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<EnvironmentVariables Include="DotNetBuildVertical=true" Condition="'$(DotNetBuildVertical)' == 'true'" />
|
<EnvironmentVariables Include="DotNetBuildVertical=true" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">
|
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">
|
||||||
|
@ -176,7 +174,7 @@
|
||||||
Condition="'$(UseBootstrapArcade)' == 'true'" />
|
Condition="'$(UseBootstrapArcade)' == 'true'" />
|
||||||
|
|
||||||
<ArcadeSharedFrameworkSdkOverride Include="Microsoft.DotNet.SharedFramework.Sdk" Group="ARCADE_SHARED_FX_SDK" Version="$(arcadeOutputPackageVersion)" />
|
<ArcadeSharedFrameworkSdkOverride Include="Microsoft.DotNet.SharedFramework.Sdk" Group="ARCADE_SHARED_FX_SDK" Version="$(arcadeOutputPackageVersion)" />
|
||||||
<WindowsDesktopSdkOverride Include="Microsoft.Net.Sdk.WindowsDesktop" Group="WINDOWS_DESKTOP" Location="$(ToolsDir)EmptySdk" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<WindowsDesktopSdkOverride Include="Microsoft.Net.Sdk.WindowsDesktop" Group="WINDOWS_DESKTOP" Location="$(ToolsDir)EmptySdk" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- CLI internal version is statically set by us to a version that will never show up in the wild.
|
<!-- CLI internal version is statically set by us to a version that will never show up in the wild.
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Exclude repositories that currently don't build when not building source-only. -->
|
<!-- Exclude repositories that currently don't build when not building source-only. -->
|
||||||
<ItemGroup Condition="'$(DotNetBuildVertical)' == 'true'">
|
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||||
<RepositoryReference Remove="roslyn" />
|
<RepositoryReference Remove="roslyn" />
|
||||||
<RepositoryReference Remove="wpf" />
|
<RepositoryReference Remove="wpf" />
|
||||||
<RepositoryReference Remove="msbuild" />
|
<RepositoryReference Remove="msbuild" />
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
<SourceBuildSources Condition="'$(ExtraRestoreSourcePath)' != ''">$(SourceBuildSources);$(ExtraSourcesNuGetSourceName)</SourceBuildSources>
|
<SourceBuildSources Condition="'$(ExtraRestoreSourcePath)' != ''">$(SourceBuildSources);$(ExtraSourcesNuGetSourceName)</SourceBuildSources>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<PrebuiltNuGetSourceName>prebuilt</PrebuiltNuGetSourceName>
|
<PrebuiltNuGetSourceName>prebuilt</PrebuiltNuGetSourceName>
|
||||||
<PreviouslySourceBuiltNuGetSourceName>previously-source-built</PreviouslySourceBuiltNuGetSourceName>
|
<PreviouslySourceBuiltNuGetSourceName>previously-source-built</PreviouslySourceBuiltNuGetSourceName>
|
||||||
<ReferencePackagesNuGetSourceName>reference-packages</ReferencePackagesNuGetSourceName>
|
<ReferencePackagesNuGetSourceName>reference-packages</ReferencePackagesNuGetSourceName>
|
||||||
|
@ -84,22 +84,22 @@
|
||||||
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||||
BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)"
|
BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)"
|
||||||
KeepFeedPrefixes="@(KeepFeedPrefixes)"
|
KeepFeedPrefixes="@(KeepFeedPrefixes)"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||||
SourceName="$(PrebuiltNuGetSourceName)"
|
SourceName="$(PrebuiltNuGetSourceName)"
|
||||||
SourcePath="$(PrebuiltPackagesPath)"
|
SourcePath="$(PrebuiltPackagesPath)"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||||
SourceName="$(PreviouslySourceBuiltNuGetSourceName)"
|
SourceName="$(PreviouslySourceBuiltNuGetSourceName)"
|
||||||
SourcePath="$(PrebuiltSourceBuiltPackagesPath)"
|
SourcePath="$(PrebuiltSourceBuiltPackagesPath)"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||||
SourceName="$(ReferencePackagesNuGetSourceName)"
|
SourceName="$(ReferencePackagesNuGetSourceName)"
|
||||||
SourcePath="$(ReferencePackagesDir)"
|
SourcePath="$(ReferencePackagesDir)"
|
||||||
Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
|
||||||
SourceName="$(SourceBuiltNuGetSourceName)"
|
SourceName="$(SourceBuiltNuGetSourceName)"
|
||||||
|
@ -151,7 +151,7 @@
|
||||||
|
|
||||||
<!-- TODO: Remove when all repos use a consistent set of eng/common files: https://github.com/dotnet/source-build/issues/3710. -->
|
<!-- TODO: Remove when all repos use a consistent set of eng/common files: https://github.com/dotnet/source-build/issues/3710. -->
|
||||||
<Target Name="UpdateEngCommonFiles"
|
<Target Name="UpdateEngCommonFiles"
|
||||||
Condition="'$(UpdateEngCommonFiles)' == 'true' or '$(DotNetBuildVertical)' == 'true'"
|
Condition="'$(UpdateEngCommonFiles)' == 'true' or '$(DotNetBuildSourceOnly)' != 'true'"
|
||||||
BeforeTargets="Build">
|
BeforeTargets="Build">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<OrchestratorEngCommonFile Include="$(RepositoryEngineeringDir)common\**\*" />
|
<OrchestratorEngCommonFile Include="$(RepositoryEngineeringDir)common\**\*" />
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -7,17 +7,17 @@
|
||||||
<!-- BuildActions includes -publish which is not supported by the aspnetcore build script. -->
|
<!-- BuildActions includes -publish which is not supported by the aspnetcore build script. -->
|
||||||
<BuildActions>$(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack</BuildActions>
|
<BuildActions>$(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack</BuildActions>
|
||||||
<!-- On Windows, build all for the VB PoC -->
|
<!-- On Windows, build all for the VB PoC -->
|
||||||
<BuildActions Condition="'$(DotNetBuildVertical)' == 'true' and '$(BuildOS)' == 'windows'">$(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack</BuildActions>
|
<BuildActions Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(BuildOS)' == 'windows'">$(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack</BuildActions>
|
||||||
|
|
||||||
<BuildArgs Condition="'$(OverrideTargetArch)' == ''">$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
|
<BuildArgs Condition="'$(OverrideTargetArch)' == ''">$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
|
||||||
<BuildArgs Condition="'$(OverrideTargetArch)' != ''">$(BuildArgs) $(FlagParameterPrefix)arch $(OverrideTargetArch)</BuildArgs>
|
<BuildArgs Condition="'$(OverrideTargetArch)' != ''">$(BuildArgs) $(FlagParameterPrefix)arch $(OverrideTargetArch)</BuildArgs>
|
||||||
<BuildArgs Condition="'$(DotNetBuildVertical)' != 'true' or '$(BuildOS)' != 'windows'">$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
|
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(BuildOS)' != 'windows'">$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
|
||||||
<BuildArgs Condition="'$(DotNetBuildVertical)' != 'true' or '$(BuildOS)' != 'windows'">$(BuildArgs) $(FlagParameterPrefix)no-build-nodejs</BuildArgs>
|
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(BuildOS)' != 'windows'">$(BuildArgs) $(FlagParameterPrefix)no-build-nodejs</BuildArgs>
|
||||||
|
|
||||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
|
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
|
||||||
<OverrideTargetRid Condition="'$(TargetOS)' == 'osx'">osx-$(TargetArchitecture)</OverrideTargetRid>
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'osx'">osx-$(TargetArchitecture)</OverrideTargetRid>
|
||||||
<OverrideTargetRid Condition="'$(TargetOS)' == 'freebsd'">freebsd-$(TargetArchitecture)</OverrideTargetRid>
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'freebsd'">freebsd-$(TargetArchitecture)</OverrideTargetRid>
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
<RepositoryReference Include="roslyn" />
|
<RepositoryReference Include="roslyn" />
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
<EnvironmentVariables Include="warn_as_error=false" />
|
<EnvironmentVariables Include="warn_as_error=false" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<!--
|
<!--
|
||||||
From aspnetcore Versions.props:
|
From aspnetcore Versions.props:
|
||||||
Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
|
Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Toolsets -->
|
<!-- Toolsets -->
|
||||||
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
|
|
||||||
<!-- Product Repos -->
|
<!-- Product Repos -->
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
<RepositoryReference Include="emsdk" />
|
<RepositoryReference Include="emsdk" />
|
||||||
<RepositoryReference Include="cecil" />
|
<RepositoryReference Include="cecil" />
|
||||||
<RepositoryReference Include="symreader" />
|
<RepositoryReference Include="symreader" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
<RepositoryReference Include="roslyn" />
|
<RepositoryReference Include="roslyn" />
|
||||||
<RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
|
<RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
<RepositoryReference Include="installer" />
|
<RepositoryReference Include="installer" />
|
||||||
|
|
||||||
<!-- Package source-build artifacts -->
|
<!-- Package source-build artifacts -->
|
||||||
<RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
|
|
||||||
<!-- Testing. -->
|
<!-- Testing. -->
|
||||||
<RepositoryReference Include="scenario-tests" />
|
<RepositoryReference Include="scenario-tests" />
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="roslyn" />
|
<RepositoryReference Include="roslyn" />
|
||||||
<RepositoryReference Include="roslyn-analyzers" />
|
<RepositoryReference Include="roslyn-analyzers" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
<BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:AspNetCoreInstallerRid=$(OverrideTargetRid)</BuildArgs>
|
<BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:AspNetCoreInstallerRid=$(OverrideTargetRid)</BuildArgs>
|
||||||
<!-- installer always wants to build portable on FreeBSD -->
|
<!-- installer always wants to build portable on FreeBSD -->
|
||||||
<BuildArgs Condition="'$(TargetOS)' == 'freebsd' and '$(DotNetBuildFromSource)' == 'true'">$(BuildArgs) /p:PortableBuild=true</BuildArgs>
|
<BuildArgs Condition="'$(TargetOS)' == 'freebsd' and '$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) /p:PortableBuild=true</BuildArgs>
|
||||||
<BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:CoreSetupRid=$(OverrideTargetRid)</BuildArgs>
|
<BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:CoreSetupRid=$(OverrideTargetRid)</BuildArgs>
|
||||||
|
|
||||||
<!-- Consume the source-built Core-Setup and toolset. This line must be removed to source-build CLI without source-building Core-Setup first. -->
|
<!-- Consume the source-built Core-Setup and toolset. This line must be removed to source-build CLI without source-building Core-Setup first. -->
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<RepositoryReference Include="emsdk" />
|
<RepositoryReference Include="emsdk" />
|
||||||
<RepositoryReference Include="fsharp" />
|
<RepositoryReference Include="fsharp" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="nuget-client" />
|
<RepositoryReference Include="nuget-client" />
|
||||||
<RepositoryReference Include="roslyn" />
|
<RepositoryReference Include="roslyn" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
<RepositoryReference Include="xdt" />
|
<RepositoryReference Include="xdt" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -30,12 +30,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="command-line-api" />
|
<RepositoryReference Include="command-line-api" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<SourceBuiltSdkOverride Include="@(WindowsDesktopSdkOverride)" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<SourceBuiltSdkOverride Include="@(WindowsDesktopSdkOverride)" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<BuildArgs>$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
|
<BuildArgs>$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
|
<PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
|
||||||
<BuildNonPortable>true</BuildNonPortable>
|
<BuildNonPortable>true</BuildNonPortable>
|
||||||
<BuildNonPortable Condition="'$(PortableBuild)' == 'true'">false</BuildNonPortable>
|
<BuildNonPortable Condition="'$(PortableBuild)' == 'true'">false</BuildNonPortable>
|
||||||
|
@ -38,14 +38,14 @@
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="cecil" />
|
<RepositoryReference Include="cecil" />
|
||||||
<RepositoryReference Include="symreader" />
|
<RepositoryReference Include="symreader" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<SourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
|
<SourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_4" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_4" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
<RepositoryReference Include="nuget-client" />
|
<RepositoryReference Include="nuget-client" />
|
||||||
<RepositoryReference Include="roslyn-analyzers" />
|
<RepositoryReference Include="roslyn-analyzers" />
|
||||||
<RepositoryReference Include="vstest" />
|
<RepositoryReference Include="vstest" />
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="nuget-client" />
|
<RepositoryReference Include="nuget-client" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
<RepositoryReference Include="diagnostics" />
|
<RepositoryReference Include="diagnostics" />
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
<RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue