[VMR] Light up Alpine lanes (#19332)

This commit is contained in:
Jo Shields 2024-04-10 12:03:01 -04:00 committed by GitHub
parent c970b67c09
commit 88a7cec797
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 121 additions and 2 deletions

View file

@ -747,6 +747,59 @@ stages:
targetOS: linux
targetArchitecture: arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Alpine
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerX64AlpineCrossContainer }}
crossRootFs: '/crossrootfs/x64'
targetOS: linux-musl
targetArchitecture: x64
extraProperties: /p:TargetRID=linux-musl-x64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Alpine_Mono
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerX64AlpineCrossContainer }}
crossRootFs: '/crossrootfs/x64'
useMonoRuntime: true
targetOS: linux-musl
targetArchitecture: x64
extraProperties: /p:TargetRID=linux-musl-x64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Alpine
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArmAlpineCrossContainer }}
crossRootFs: '/crossrootfs/arm'
targetOS: linux-musl
targetArchitecture: arm
extraProperties: /p:TargetRID=linux-musl-arm
- template: ../jobs/vmr-build.yml
parameters:
buildName: Mariner_x64_Cross_Alpine
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: arm64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.marinerArm64AlpineCrossContainer }}
crossRootFs: '/crossrootfs/arm64'
targetOS: linux-musl
targetArchitecture: arm64
extraProperties: /p:TargetRID=linux-musl-arm64
- template: ../jobs/vmr-build.yml
parameters:
buildName: OSX

View file

@ -26,6 +26,12 @@ variables:
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
- name: marinerArm64CrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
- name: marinerX64AlpineCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine
- name: marinerArmAlpineCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
- name: marinerArm64AlpineCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
- name: androidCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64
- name: browserCrossContainer

View file

@ -15,8 +15,8 @@
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)os $(TargetOS)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildRuntimeWasmEnableThreads)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeWasmEnableThreads=true</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeNativeAOTRuntimePack=true</BuildArgs>
<BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)pgoinstrument</BuildArgs>

View file

@ -0,0 +1,20 @@
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
index ------------
--- a/msftSdkFiles.txt
+++ b/ubSdkFiles.txt
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
@@ ------------ @@
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
./sdk/x.y.z/Microsoft.NET.StringTools.dll
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets

View file

@ -0,0 +1,20 @@
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
index ------------
--- a/msftSdkFiles.txt
+++ b/ubSdkFiles.txt
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
@@ ------------ @@
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
./sdk/x.y.z/Microsoft.NET.StringTools.dll
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets

View file

@ -0,0 +1,20 @@
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
index ------------
--- a/msftSdkFiles.txt
+++ b/ubSdkFiles.txt
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
@@ ------------ @@
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
./sdk/x.y.z/Microsoft.NET.StringTools.dll
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets