Merge branch 'release/7.0.2xx' into release/7.0.3xx
This commit is contained in:
commit
13dae8f6ee
23 changed files with 218 additions and 233 deletions
|
@ -193,7 +193,7 @@
|
||||||
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
||||||
necessary, and this property is removed from the file.
|
necessary, and this property is removed from the file.
|
||||||
-->
|
-->
|
||||||
<PrivateSourceBuiltArtifactsPackageVersion>7.0.100</PrivateSourceBuiltArtifactsPackageVersion>
|
<PrivateSourceBuiltArtifactsPackageVersion>7.0.102-4</PrivateSourceBuiltArtifactsPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- Workload manifest package versions -->
|
<!-- Workload manifest package versions -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -101,6 +101,35 @@ jobs:
|
||||||
Contents: '*.tar.gz'
|
Contents: '*.tar.gz'
|
||||||
TargetFolder: $(tarballDir)/packages/archive/
|
TargetFolder: $(tarballDir)/packages/archive/
|
||||||
|
|
||||||
|
- script: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/"
|
||||||
|
packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props"
|
||||||
|
notFoundMessage="No source-built SDK found to download..."
|
||||||
|
|
||||||
|
echo "Looking for source-built SDK to download..."
|
||||||
|
archiveVersionLine=`grep -m 1 "<PrivateSourceBuiltSDKVersion>" "$packageVersionsPath" || :`
|
||||||
|
versionPattern="<PrivateSourceBuiltSDKVersion>(.*)</PrivateSourceBuiltSDKVersion>"
|
||||||
|
|
||||||
|
if [[ $archiveVersionLine =~ $versionPattern ]]; then
|
||||||
|
filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz"
|
||||||
|
archiveUrl="${sourceBuiltSDKUrl}${filename}"
|
||||||
|
downloadDir=$(mktemp -d)
|
||||||
|
(cd $downloadDir && curl --retry 5 -O $archiveUrl)
|
||||||
|
|
||||||
|
mkdir $(tarballDir)/.dotnet
|
||||||
|
tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet
|
||||||
|
rm -rf $downloadDir
|
||||||
|
else
|
||||||
|
echo "$notFoundMessage"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet"
|
||||||
|
displayName: Setup Previously Source-Built SDK
|
||||||
|
condition: eq(variables._WithPreviousSDK, 'true')
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
|
|
@ -36,36 +36,48 @@ jobs:
|
||||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||||
matrix:
|
matrix:
|
||||||
CentOSStream8-Online:
|
CentOSStream8-Online:
|
||||||
_BootstrapPrep: false
|
_BootstrapPrep: true
|
||||||
_Container: ${{ parameters.centOSStream8Container }}
|
_Container: ${{ parameters.centOSStream8Container }}
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: true
|
_ExcludeOmniSharpTests: true
|
||||||
_RunOnline: true
|
_RunOnline: true
|
||||||
|
_WithPreviousSDK: false
|
||||||
CentOSStream8-Offline:
|
CentOSStream8-Offline:
|
||||||
|
_BootstrapPrep: true
|
||||||
|
_Container: ${{ parameters.centOSStream8Container }}
|
||||||
|
_EnablePoison: false
|
||||||
|
_ExcludeOmniSharpTests: true
|
||||||
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
|
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
|
CentOSStream8-WithPreviousSDK:
|
||||||
_BootstrapPrep: false
|
_BootstrapPrep: false
|
||||||
_Container: ${{ parameters.centOSStream8Container }}
|
_Container: ${{ parameters.centOSStream8Container }}
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: true
|
_ExcludeOmniSharpTests: true
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
_WithPreviousSDK: true
|
||||||
CentOSStream9-Offline:
|
CentOSStream9-Offline:
|
||||||
_BootstrapPrep: false
|
_BootstrapPrep: true
|
||||||
_Container: ${{ parameters.centOSStream9Container }}
|
_Container: ${{ parameters.centOSStream9Container }}
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
Fedora36-Offline:
|
Fedora36-Offline:
|
||||||
_BootstrapPrep: false
|
_BootstrapPrep: true
|
||||||
_Container: ${{ parameters.fedora36Container }}
|
_Container: ${{ parameters.fedora36Container }}
|
||||||
_EnablePoison: true
|
_EnablePoison: true
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
Ubuntu2004-Offline:
|
Ubuntu2004-Offline:
|
||||||
_BootstrapPrep: false
|
_BootstrapPrep: true
|
||||||
_Container: ${{ parameters.ubuntu2004Container }}
|
_Container: ${{ parameters.ubuntu2004Container }}
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
name: Build_Tarball_x64
|
name: Build_Tarball_x64
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
|
@ -89,6 +101,7 @@ jobs:
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
name: Build_Tarball_arm64
|
name: Build_Tarball_arm64
|
||||||
pool: ${{ parameters.poolInternalArm64 }}
|
pool: ${{ parameters.poolInternalArm64 }}
|
||||||
|
|
||||||
|
@ -109,6 +122,7 @@ jobs:
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
name: Build_Tarball_x64_Using_Previous
|
name: Build_Tarball_x64_Using_Previous
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
|
|
|
@ -285,10 +285,6 @@
|
||||||
<EngCommonContent Include="$(RepoRoot)eng/common/**/*" />
|
<EngCommonContent Include="$(RepoRoot)eng/common/**/*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Copy
|
|
||||||
SourceFiles="$(TarballGitInfoDir)runtime.props"
|
|
||||||
DestinationFiles="$(TarballGitInfoDir)runtime-portable.props" />
|
|
||||||
|
|
||||||
<Copy
|
<Copy
|
||||||
SourceFiles="@(TarballContent)"
|
SourceFiles="@(TarballContent)"
|
||||||
DestinationFiles="@(TarballContent->'$(TarballRootDir)%(RecursiveDir)%(Filename)%(Extension)')" />
|
DestinationFiles="@(TarballContent->'$(TarballRootDir)%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
|
|
|
@ -23,19 +23,6 @@
|
||||||
<Platform Condition="'$(Platform)' == ''">x64</Platform>
|
<Platform Condition="'$(Platform)' == ''">x64</Platform>
|
||||||
|
|
||||||
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
|
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
|
||||||
|
|
||||||
<SourceBuildUseMonoRuntime>false</SourceBuildUseMonoRuntime>
|
|
||||||
<!-- These architectures are only supported with mono runtime -->
|
|
||||||
<SourceBuildUseMonoRuntime Condition="'$(BuildArchitecture)' == 's390x'">true</SourceBuildUseMonoRuntime>
|
|
||||||
<SourceBuildUseMonoRuntime Condition="'$(BuildArchitecture)' == 'ppc64le'">true</SourceBuildUseMonoRuntime>
|
|
||||||
|
|
||||||
<!-- new supported portable/nonportable options. These control whether to build portable runtime
|
|
||||||
or portable SDK. The PortableBuild flag is only set in runtime-portable.proj and should
|
|
||||||
no longer be passed in. -->
|
|
||||||
<BuildPortableRuntime Condition="'$(BuildPortableRuntime)' == ''">false</BuildPortableRuntime>
|
|
||||||
<BuildPortableSdk Condition="'$(BuildPortableSdk)' == ''">false</BuildPortableSdk>
|
|
||||||
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableRuntime)' != 'true'">true</UseSystemLibraries>
|
|
||||||
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == ''">false</UseSystemLibraries>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- This repo's projects are entirely infrastructure and do not ship. -->
|
<!-- This repo's projects are entirely infrastructure and do not ship. -->
|
||||||
|
@ -236,12 +223,8 @@
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="$(runtimeOutputPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="$(runtimeOutputPackageVersion)" />
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="$(runtimeOutputPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="$(runtimeOutputPackageVersion)" />
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="$(runtimeOutputPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="$(runtimeOutputPackageVersion)" />
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinux$(Platform)PackageVersion)" />
|
|
||||||
<!-- core-sdk uses this property for ASP.NET blob directory -->
|
<!-- core-sdk uses this property for ASP.NET blob directory -->
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
|
||||||
<!-- OSX needs the OSX version instead of Linux. We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing. -->
|
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
|
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)" DoNotOverwrite="true" />
|
|
||||||
|
|
||||||
<!-- Used by installer to determine sdk version -->
|
<!-- Used by installer to determine sdk version -->
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftDotnetToolsetInternalPackageVersion" Version="%24(MicrosoftNETSdkPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftDotnetToolsetInternalPackageVersion" Version="%24(MicrosoftNETSdkPackageVersion)" />
|
||||||
|
@ -253,6 +236,10 @@
|
||||||
<!-- if MicrosoftSourceLinkCommonPackageVersion is non-empty, then we've already built SourceLink, regardless of whether
|
<!-- if MicrosoftSourceLinkCommonPackageVersion is non-empty, then we've already built SourceLink, regardless of whether
|
||||||
this is the production or offline build, so we should use that version. -->
|
this is the production or offline build, so we should use that version. -->
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftSourceLinkVersion" Version="%24(MicrosoftSourceLinkCommonPackageVersion)" />
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftSourceLinkVersion" Version="%24(MicrosoftSourceLinkCommonPackageVersion)" />
|
||||||
|
|
||||||
|
<!-- non-rid-specific versions of RID-specific version variables to use for bootstrapping -->
|
||||||
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimeVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeCentos8X64PackageVersion)" />
|
||||||
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppCrossgen2Version" Version="%24(MicrosoftNETCoreAppCrossgen2Centos8X64PackageVersion)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -7,5 +7,9 @@
|
||||||
<MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
|
<MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
|
||||||
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
|
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
|
||||||
<RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>
|
<RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>
|
||||||
|
|
||||||
|
<MicrosoftNETSdkILVersion>7.0.0</MicrosoftNETSdkILVersion>
|
||||||
|
<MicrosoftNETCoreILAsmVersion>7.0.0</MicrosoftNETCoreILAsmVersion>
|
||||||
|
<MicrosoftNETCoreILDAsmVersion>7.0.0</MicrosoftNETCoreILDAsmVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -14,35 +14,39 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
|
<!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
|
||||||
|
<PackageDownload Include="Microsoft.Aspnetcore.App.Runtime.linux-x64" Version="[$(MicrosoftAspNetCoreAppRuntimeVersion)]" />
|
||||||
|
<PackageDownload Include="Microsoft.NETCore.App.Crossgen2.linux-x64" Version="[$(MicrosoftNETCoreAppCrossgen2Version)]" />
|
||||||
|
<PackageDownload Include="Microsoft.NETCore.App.Host.linux-x64" Version="[$(MicrosoftNETCoreAppHostPackageVersion)]" />
|
||||||
|
<PackageDownload Include="Microsoft.NETCore.App.Runtime.linux-x64" Version="[$(MicrosoftNETCoreAppRuntimeVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NET.HostModel" Version="[$(MicrosoftNETHostModelVersion)]" />
|
<PackageDownload Include="Microsoft.NET.HostModel" Version="[$(MicrosoftNETHostModelVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
|
<PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
<PackageDownload Include="Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
<PackageDownload Include="Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
<PackageDownload Include="Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
<PackageDownload Include="runtime.linux-x64.Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-x64.runtime.native.System.IO.Ports" Version="[$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)]" />
|
<PackageDownload Include="runtime.linux-x64.runtime.native.System.IO.Ports" Version="[$(SystemIOPortsVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
<PackageDownload Include="runtime.linux-musl-x64.Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
||||||
<!-- There's no nuget package for runtime.linux-musl-x64.runtime.native.System.IO.Ports
|
<!-- There's no nuget package for runtime.linux-musl-x64.runtime.native.System.IO.Ports
|
||||||
<PackageReference Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" Version="$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)" />
|
<PackageReference Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" Version="$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)" />
|
||||||
-->
|
-->
|
||||||
<!-- Packages needed to bootstrap arm64 -->
|
<!-- Packages needed to bootstrap arm64 -->
|
||||||
<PackageDownload Include="Microsoft.Aspnetcore.App.Runtime.linux-arm64" Version="[$(MicrosoftAspNetCoreAppRuntimeLinuxx64Version)]" />
|
<PackageDownload Include="Microsoft.Aspnetcore.App.Runtime.linux-arm64" Version="[$(MicrosoftAspNetCoreAppRuntimeVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.App.Crossgen2.linux-arm64" Version="[$(MicrosoftNETCoreAppCrossgen2LinuxX64Version)]" />
|
<PackageDownload Include="Microsoft.NETCore.App.Crossgen2.linux-arm64" Version="[$(MicrosoftNETCoreAppCrossgen2Version)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.App.Host.linux-arm64" Version="[$(MicrosoftNETCoreAppHostLinuxX64Version)]" />
|
<PackageDownload Include="Microsoft.NETCore.App.Host.linux-arm64" Version="[$(MicrosoftNETCoreAppHostPackageVersion)]" />
|
||||||
<PackageDownload Include="Microsoft.NETCore.App.Runtime.linux-arm64" Version="[$(MicrosoftNETCoreAppRuntimeLinuxX64Version)]" />
|
<PackageDownload Include="Microsoft.NETCore.App.Runtime.linux-arm64" Version="[$(MicrosoftNETCoreAppRuntimeVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.DotNet.IlCompiler" Version="[$(RuntimeLinuxX64MicrosoftDotNetIlCompilerVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.DotNet.IlCompiler" Version="[$(MicrosoftDotNetIlCompilerVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="[$(MicrosoftNETCoreDotNetAppHostVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHost" Version="[$(MicrosoftNETCoreDotNetHostVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" Version="[$(MicrosoftNETCoreDotNetHostPolicyVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" Version="[$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" Version="[$(MicrosoftNETCoreDotNetHostResolverVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILDAsm" Version="[$(RuntimeLinuxX64MicrosoftNETCoreILDAsmVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.TestHost" Version="[$(RuntimeLinuxX64MicrosoftNETCoreTestHostVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
|
||||||
<PackageDownload Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="[$(RuntimeLinuxX64RuntimeNativeSystemIOPortsVersion)]" />
|
<PackageDownload Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="[$(RuntimeNativeSystemIOPortsVersion)]" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="BuildBoostrapPreviouslySourceBuilt" AfterTargets="Restore">
|
<Target Name="BuildBoostrapPreviouslySourceBuilt" AfterTargets="Restore">
|
||||||
|
@ -73,6 +77,30 @@
|
||||||
Targets="CopyDownloadedPackage"
|
Targets="CopyDownloadedPackage"
|
||||||
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
|
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
|
||||||
|
|
||||||
|
<!-- override PVP with bootstrap-override package versions -->
|
||||||
|
<Message Text=" Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" />
|
||||||
|
<ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props">
|
||||||
|
<Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" />
|
||||||
|
</ReadLinesFromFile>
|
||||||
|
<ReadLinesFromFile File="$(BootstrapOverrideVersionsProps)">
|
||||||
|
<Output TaskParameter="Lines" ItemName="BootstrapPackageVersionLines" />
|
||||||
|
</ReadLinesFromFile>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<OriginalPackageVersionLines Remove="</Project>" />
|
||||||
|
<BootstrapPackageVersionLines Remove="<Project>" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
|
||||||
|
Lines="@(OriginalPackageVersionLines)"
|
||||||
|
Overwrite="true"
|
||||||
|
/>
|
||||||
|
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
|
||||||
|
Lines="@(BootstrapPackageVersionLines)"
|
||||||
|
Overwrite="false"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
<!-- Repack tarball with new bootstrap name -->
|
<!-- Repack tarball with new bootstrap name -->
|
||||||
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
|
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
|
||||||
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
|
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
|
||||||
|
|
|
@ -12,6 +12,7 @@ jobs:
|
||||||
_EnablePoison: false
|
_EnablePoison: false
|
||||||
_ExcludeOmniSharpTests: false
|
_ExcludeOmniSharpTests: false
|
||||||
_RunOnline: false
|
_RunOnline: false
|
||||||
|
_WithPreviousSDK: false
|
||||||
name: Build_Tarball_x64
|
name: Build_Tarball_x64
|
||||||
pool:
|
pool:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "7.0.100"
|
"dotnet": "7.0.102"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-nodejs</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) --no-build-nodejs</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid)</BuildCommandArgs>
|
||||||
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
||||||
included by Arcade -->
|
included by Arcade -->
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0</BuildCommandArgs>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
||||||
|
|
||||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid)</BuildCommandArgs>
|
||||||
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
|
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
|
||||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
|
||||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
|
|
||||||
<!-- Tier 2 -->
|
<!-- Tier 2 -->
|
||||||
<RepositoryReference Include="linker" />
|
<RepositoryReference Include="linker" />
|
||||||
<RepositoryReference Include="runtime-portable" />
|
|
||||||
<RepositoryReference Include="runtime" />
|
<RepositoryReference Include="runtime" />
|
||||||
<RepositoryReference Include="msbuild" />
|
<RepositoryReference Include="msbuild" />
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
<SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz</SourceBuiltTarballName>
|
<SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz</SourceBuiltTarballName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Exec Command="tar --numeric-owner --exclude='Microsoft.SourceBuild.Intermediate.*.nupkg' --exclude='runtime.$(TargetRid).*.nupkg' -czf $(SourceBuiltTarballName) *.nupkg *.props SourceBuildReferencePackages/"
|
<Exec Command="tar --numeric-owner --exclude='Microsoft.SourceBuild.Intermediate.*.nupkg' -czf $(SourceBuiltTarballName) *.nupkg *.props SourceBuildReferencePackages/"
|
||||||
WorkingDirectory="$(SourceBuiltPackagesPath)" />
|
WorkingDirectory="$(SourceBuiltPackagesPath)" />
|
||||||
|
|
||||||
<Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
|
<Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
<Project>
|
|
||||||
<Import Project="runtime.common.props"/>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<SourceDirectory>runtime</SourceDirectory>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Repository References -->
|
|
||||||
<ItemGroup>
|
|
||||||
<RepositoryReference Include="arcade" />
|
|
||||||
<RepositoryReference Include="linker" />
|
|
||||||
<RepositoryReference Include="source-build-externals" />
|
|
||||||
<RepositoryReference Include="roslyn" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<!-- Additional Targets -->
|
|
||||||
<Target Name="CleanupRepoForNonPortableBuild"
|
|
||||||
BeforeTargets="CleanupRepo"
|
|
||||||
AfterTargets="RemoveBuiltPackagesFromCache">
|
|
||||||
<!-- Make a copy of the portable build logs & project.assets.json files-->
|
|
||||||
<PropertyGroup>
|
|
||||||
<PortableLogDir>$(ProjectDirectory)artifacts/portableLog</PortableLogDir>
|
|
||||||
<PortableObjDir>$(ProjectDirectory)artifacts/portableObj</PortableObjDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PortableLogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" />
|
|
||||||
<PortableLogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" />
|
|
||||||
<PortableObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
<MakeDir Directories="$(PortableLogDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>
|
|
||||||
<MakeDir Directories="$(PortableObjDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>
|
|
||||||
<Copy SourceFiles="@(PortableLogFilesToCopy)" DestinationFolder="$(PortableLogDir)/%(RecursiveDir)" Condition="Exists('$(PortableLogDir)')" />
|
|
||||||
<Copy SourceFiles="@(PortableObjFilesToCopy)" DestinationFolder="$(PortableObjDir)/%(RecursiveDir)" Condition="Exists('$(PortableObjDir)')" />
|
|
||||||
|
|
||||||
<!-- Cleanup everything else -->
|
|
||||||
<ItemGroup>
|
|
||||||
<PortableDirsToDelete Include="$([System.IO.Directory]::GetDirectories("$(ProjectDirectory)artifacts/"))" Condition="Exists('$(ProjectDirectory)artifacts')" />
|
|
||||||
<PortableDirsToDelete Include="$(ProjectDirectory)bin" Condition="Exists('$(ProjectDirectory)bin')" />
|
|
||||||
<PortableDirsToDelete Remove="$(PortableLogDir)" />
|
|
||||||
<PortableDirsToDelete Remove="$(PortableObjDir)" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<RemoveDir Directories="@(PortableDirsToDelete)" />
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Import Project="runtime.common.targets" />
|
|
||||||
</Project>
|
|
|
@ -1,47 +0,0 @@
|
||||||
<Project>
|
|
||||||
<PropertyGroup>
|
|
||||||
<SourceDirectory>runtime</SourceDirectory>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
|
||||||
|
|
||||||
<!-- Build arguments -->
|
|
||||||
<PropertyGroup>
|
|
||||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
|
||||||
|
|
||||||
<!-- StandardSourceBuildArgs includes -bl which overrides the output of the inner binlog. Change to -nobl -->
|
|
||||||
<BuildCommandArgs>$(StandardSourceBuildArgs.Replace('-bl', '-nobl'))</BuildCommandArgs>
|
|
||||||
|
|
||||||
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
|
||||||
<BuildCommand Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64' AND '$(BuildArchitecture)' != 'arm'">$(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
|
||||||
|
|
||||||
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Output / source-build flags -->
|
|
||||||
<PropertyGroup>
|
|
||||||
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
|
||||||
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
|
||||||
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
|
|
||||||
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- SDK Overrides -->
|
|
||||||
<ItemGroup>
|
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
|
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadeCoreFxTestingOverride)" />
|
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadePackagingOverride)" />
|
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadeTargetFrameworkOverride)" />
|
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<!-- Environment Variables -->
|
|
||||||
<ItemGroup>
|
|
||||||
<EnvironmentVariables Include="BuildInParallel=false" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
|
@ -1,46 +0,0 @@
|
||||||
<Project>
|
|
||||||
|
|
||||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddRidToRuntimeJson" />
|
|
||||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishCoreSetupBinaries" />
|
|
||||||
|
|
||||||
<Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
|
|
||||||
<ItemGroup>
|
|
||||||
<PackagesOutputList Include="$(ShippingPackagesOutput)" />
|
|
||||||
<PackagesOutputList Include="$(NonShippingPackagesOutput)" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="UpdateRuntimeGraph"
|
|
||||||
BeforeTargets="Build"
|
|
||||||
Condition="'$(_IsBootstrapping)' == 'true'">
|
|
||||||
<PropertyGroup>
|
|
||||||
<RuntimeJsonFile>$(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeJsonFile>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Message Importance="High" Text="Adding rid, $(TargetRid), to $(RuntimeJsonFile)" />
|
|
||||||
<AddRidToRuntimeJson RuntimeJson="$(RuntimeJsonFile)"
|
|
||||||
Rid="$(TargetRid)-$(Platform)" />
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="CopyBinariesToBinFolder"
|
|
||||||
AfterTargets="ExtractIntermediatePackages"
|
|
||||||
Inputs="$(MSBuildProjectFullPath)"
|
|
||||||
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
|
|
||||||
<ItemGroup>
|
|
||||||
<_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
|
|
||||||
<_builtRuntimePackages>
|
|
||||||
<TransformedFileName>$([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))</TransformedFileName>
|
|
||||||
</_builtRuntimePackages>
|
|
||||||
<BinariesToCopy Include="$(SourceBuiltAssetsDir)*.*" Exclude="$(SourceBuiltAssetsDir)*.nupkg;$(SourceBuiltAssetsDir)*.requires_nupkg_signing" />
|
|
||||||
<BinariesToCopy Include="@(_builtRuntimePackages->'$(SourceBuiltPackagesPath)%(TransformedFileName)')" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Copy SourceFiles="@(BinariesToCopy)"
|
|
||||||
DestinationFolder="$(OutputPath)runtime"
|
|
||||||
Condition="'@(BinariesToCopy)'!=''" />
|
|
||||||
|
|
||||||
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
|
|
||||||
</Project>
|
|
|
@ -1,18 +1,57 @@
|
||||||
<Project>
|
<Project>
|
||||||
<Import Project="runtime.common.props"/>
|
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
||||||
|
|
||||||
|
<!-- Build arguments -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||||
|
|
||||||
|
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
|
||||||
|
|
||||||
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
|
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
|
||||||
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
|
||||||
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
|
||||||
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
|
||||||
|
|
||||||
|
<_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
|
||||||
|
<RuntimeOS>$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))</RuntimeOS>
|
||||||
|
|
||||||
|
<_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
|
||||||
|
<BaseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))</BaseOS>
|
||||||
|
|
||||||
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /p:RuntimeOS=$(RuntimeOS)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /p:BaseOS=$(BaseOS)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildNonPortable=true</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildNonPortable=true</BuildCommandArgs>
|
||||||
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Output / source-build flags -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
||||||
|
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||||
|
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
|
||||||
|
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- SDK Overrides -->
|
||||||
|
<ItemGroup>
|
||||||
|
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
|
||||||
|
<UseSourceBuiltSdkOverride Include="@(ArcadeCoreFxTestingOverride)" />
|
||||||
|
<UseSourceBuiltSdkOverride Include="@(ArcadePackagingOverride)" />
|
||||||
|
<UseSourceBuiltSdkOverride Include="@(ArcadeTargetFrameworkOverride)" />
|
||||||
|
<UseSourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Environment Variables -->
|
||||||
|
<ItemGroup>
|
||||||
|
<EnvironmentVariables Include="BuildInParallel=false" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Repository References -->
|
<!-- Repository References -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="arcade" />
|
<RepositoryReference Include="arcade" />
|
||||||
|
@ -20,8 +59,49 @@
|
||||||
<RepositoryReference Include="linker" />
|
<RepositoryReference Include="linker" />
|
||||||
<RepositoryReference Include="source-build-externals" />
|
<RepositoryReference Include="source-build-externals" />
|
||||||
<RepositoryReference Include="roslyn" />
|
<RepositoryReference Include="roslyn" />
|
||||||
<RepositoryReference Include="runtime-portable" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="runtime.common.targets" />
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddRidToRuntimeJson" />
|
||||||
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishCoreSetupBinaries" />
|
||||||
|
|
||||||
|
<Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
|
||||||
|
<ItemGroup>
|
||||||
|
<PackagesOutputList Include="$(ShippingPackagesOutput)" />
|
||||||
|
<PackagesOutputList Include="$(NonShippingPackagesOutput)" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="UpdateRuntimeGraph"
|
||||||
|
BeforeTargets="Build"
|
||||||
|
Condition="'$(_IsBootstrapping)' == 'true'">
|
||||||
|
<PropertyGroup>
|
||||||
|
<RuntimeJsonFile>$(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeJsonFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Message Importance="High" Text="Adding rid, $(TargetRid), to $(RuntimeJsonFile)" />
|
||||||
|
<AddRidToRuntimeJson RuntimeJson="$(RuntimeJsonFile)"
|
||||||
|
Rid="$(TargetRid)-$(Platform)" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="CopyBinariesToBinFolder"
|
||||||
|
AfterTargets="ExtractIntermediatePackages"
|
||||||
|
Inputs="$(MSBuildProjectFullPath)"
|
||||||
|
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
|
||||||
|
<ItemGroup>
|
||||||
|
<_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
|
||||||
|
<_builtRuntimePackages>
|
||||||
|
<TransformedFileName>$([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))</TransformedFileName>
|
||||||
|
</_builtRuntimePackages>
|
||||||
|
<BinariesToCopy Include="$(SourceBuiltAssetsDir)*.*" Exclude="$(SourceBuiltAssetsDir)*.nupkg;$(SourceBuiltAssetsDir)*.requires_nupkg_signing" />
|
||||||
|
<BinariesToCopy Include="@(_builtRuntimePackages->'$(SourceBuiltPackagesPath)%(TransformedFileName)')" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Copy SourceFiles="@(BinariesToCopy)"
|
||||||
|
DestinationFolder="$(OutputPath)runtime"
|
||||||
|
Condition="'@(BinariesToCopy)'!=''" />
|
||||||
|
|
||||||
|
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -7,6 +7,9 @@
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)</BuildCommandArgs>
|
||||||
|
|
||||||
|
<!-- Just like mono, arm does not support NativeAot -->
|
||||||
|
<BuildCommandArgs Condition="'$(BuildArchitecture)' == 'arm'">$(BuildCommandArgs) /p:NativeAotSupported=false</BuildCommandArgs>
|
||||||
|
|
||||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,11 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LocalNuGetPackageCacheDirectory>$(BaseIntermediatePath)source-build-reference-package-cache</LocalNuGetPackageCacheDirectory>
|
<LocalNuGetPackageCacheDirectory>$(BaseIntermediatePath)source-build-reference-package-cache</LocalNuGetPackageCacheDirectory>
|
||||||
|
|
||||||
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)</BuildCommand>
|
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)</BuildCommandArgs>
|
||||||
|
|
||||||
|
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
||||||
|
|
||||||
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||||
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="NuGetPack" />
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="NuGetPack" />
|
||||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ZipFileExtractToDirectory" />
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ZipFileExtractToDirectory" />
|
||||||
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceTextInFile" />
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceTextInFile" />
|
||||||
|
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceRegexInFiles" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BuildTasksTarget Include="Restore;Build;InstallResolver" />
|
<BuildTasksTarget Include="Restore;Build;InstallResolver" />
|
||||||
|
@ -22,6 +23,7 @@
|
||||||
<CallTarget Targets="
|
<CallTarget Targets="
|
||||||
UnpackTarballs;
|
UnpackTarballs;
|
||||||
BuildXPlatTasks;
|
BuildXPlatTasks;
|
||||||
|
PatchPackageVersions;
|
||||||
BuildLeakDetection;
|
BuildLeakDetection;
|
||||||
ExtractToolPackage;
|
ExtractToolPackage;
|
||||||
GenerateRootFs;
|
GenerateRootFs;
|
||||||
|
@ -118,6 +120,16 @@
|
||||||
<WriteLinesToFile File="$(CompletedSemaphorePath)BuildXPlatTasks.complete" Overwrite="true" />
|
<WriteLinesToFile File="$(CompletedSemaphorePath)BuildXPlatTasks.complete" Overwrite="true" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<!-- TODO: Remove this when the .NET 8 artifacts tarball no longer includes MicrosoftAspNetCoreAppRuntimePackageVersion -->
|
||||||
|
<Target Name="PatchPackageVersions">
|
||||||
|
<!-- Rename MicrosoftAspNetCoreAppRuntimePackageVersion so it isn't used
|
||||||
|
Fixes https://github.com/dotnet/installer/issues/14492 -->
|
||||||
|
<ReplaceRegexInFiles
|
||||||
|
InputFiles="$(IntermediatePath)PreviouslySourceBuiltPackageVersions.props"
|
||||||
|
OldTextRegex="\bMicrosoftAspNetCoreAppRuntimePackageVersion\b"
|
||||||
|
NewText="__unused" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
<Target Name="BuildLeakDetection"
|
<Target Name="BuildLeakDetection"
|
||||||
DependsOnTargets="ExtractToolPackage"
|
DependsOnTargets="ExtractToolPackage"
|
||||||
Inputs="$(MSBuildProjectFullPath)"
|
Inputs="$(MSBuildProjectFullPath)"
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: MichaelSimons <msimons@microsoft.com>
|
|
||||||
Date: Tue, 15 Nov 2022 17:34:00 +0000
|
|
||||||
Subject: [PATCH] Address Microsoft.Build.Locator prebuilt
|
|
||||||
|
|
||||||
Backport: https://github.com/dotnet/format/issues/1759
|
|
||||||
---
|
|
||||||
Directory.Packages.props | 2 +-
|
|
||||||
eng/Versions.props | 1 +
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
|
||||||
index c4bf3cf..f7e85b2 100644
|
|
||||||
--- a/Directory.Packages.props
|
|
||||||
+++ b/Directory.Packages.props
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
<PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.12.1" />
|
|
||||||
<PackageVersion Include="BenchmarkDotNet" Version="0.12.1" />
|
|
||||||
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
|
|
||||||
- <PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
|
|
||||||
+ <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
|
|
||||||
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
|
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2-beta1.22216.1" />
|
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
|
|
||||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
|
||||||
index fcd583b..2933963 100644
|
|
||||||
--- a/eng/Versions.props
|
|
||||||
+++ b/eng/Versions.props
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<MicrosoftBuildVersion>17.3.0-preview-22302-02</MicrosoftBuildVersion>
|
|
||||||
+ <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
|
|
||||||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisAnalyzersVersion>
|
|
||||||
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22426.10</MicrosoftExtensionsDependencyInjectionVersion>
|
|
||||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
|
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
|
||||||
<RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)</RuntimeNETCrossgenPackageName>
|
<RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName>
|
||||||
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
|
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
|
||||||
<!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
|
<!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
|
||||||
as will the archive file names themselves. -->
|
as will the archive file names themselves. -->
|
||||||
|
|
|
@ -84,6 +84,9 @@
|
||||||
<CombinedFrameworkHostArchiveFileName Condition=" '$(PgoInstrument)' == 'true' ">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
|
<CombinedFrameworkHostArchiveFileName Condition=" '$(PgoInstrument)' == 'true' ">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
|
||||||
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
||||||
|
|
||||||
|
<Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
|
||||||
|
<Crossgen2Rid Condition="'$(DotNetBuildFromSource)' == 'true'">$(SharedFrameworkRid)</Crossgen2Rid>
|
||||||
|
|
||||||
<AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
|
<AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
|
||||||
<AspNetCoreInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreInstallerRid>
|
<AspNetCoreInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreInstallerRid>
|
||||||
<AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
|
<AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
|
||||||
|
|
Loading…
Add table
Reference in a new issue