Skip to content

Commit 209c8c6

Browse files
authored
[ci] Remove remaining Classic test jobs. (#7924)
Removes the remaining Xamarin.Android Classic test jobs from `main` ci. Not all of these have been ported to .NET. Issue #7906 tracks these jobs and whether we should port them or if they are no longer needed. Additionally, this no longer builds or uploads the Classic `.vsix`/`.pkg` installers.
1 parent a917ac8 commit 209c8c6

File tree

9 files changed

+9
-538
lines changed

9 files changed

+9
-538
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 2 additions & 466 deletions
Large diffs are not rendered by default.

build-tools/automation/yaml-templates/build-macos.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ parameters:
1313
nugetArtifactName: $(NuGetArtifactName)
1414
provisionatorChannel: latest
1515
repositoryAlias: self
16-
signClassicPkgContent: false
1716
stageName: mac_build
1817
stageDisplayName: Mac
1918
testAssembliesArtifactName: $(TestAssembliesArtifactName)
@@ -55,7 +54,6 @@ stages:
5554
installerArtifactName: ${{ parameters.installerArtifactName }}
5655
nugetArtifactName: ${{ parameters.nugetArtifactName }}
5756
provisionatorChannel: ${{ parameters.provisionatorChannel }}
58-
signClassicPkgContent: ${{ parameters.signClassicPkgContent }}
5957
testAssembliesArtifactName: ${{ parameters.testAssembliesArtifactName }}
6058

6159
- template: remove-microbuild-tooling.yaml

build-tools/automation/yaml-templates/build-windows.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@ stages:
9292
displayName: Build Solution
9393
continueOnError: false
9494

95-
- task: MSBuild@1
96-
displayName: msbuild create-vsix
97-
inputs:
98-
solution: build-tools\create-vsix\create-vsix.csproj
99-
configuration: $(XA.Build.Configuration)
100-
msbuildArguments: /p:CreateVsixContainer=True /p:ZipPackageCompressionLevel=Normal /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-create-vsix.binlog
101-
10295
- task: MSBuild@1
10396
displayName: msbuild xabuild
10497
inputs:

build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ parameters:
44
makeMSBuildArgs: ''
55
nugetArtifactName: $(NuGetArtifactName)
66
provisionatorChannel: latest
7-
signClassicPkgContent: true
87
testAssembliesArtifactName: $(TestAssembliesArtifactName)
98

109
steps:
@@ -75,28 +74,15 @@ steps:
7574
msbuildArguments: /t:Restore /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
7675

7776
- task: MSBuild@1
78-
displayName: PKG signing - add entitlements and sign classic libraries
77+
displayName: PKG signing - add entitlements and sign
7978
inputs:
8079
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
8180
configuration: $(XA.Build.Configuration)
8281
msbuildArguments: >-
83-
/t:AddMachOEntitlements;AddMSBuildFilesUnixSign;Build
82+
/t:AddMachOEntitlements;AddMSBuildFilesUnixSign;AddMSBuildFilesUnixSignAndHarden;Build
8483
/p:SignType=$(MicroBuildSignType)
8584
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
8685
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
87-
condition: and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
88-
89-
- task: MSBuild@1
90-
displayName: PKG signing - sign classic executables
91-
inputs:
92-
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
93-
configuration: $(XA.Build.Configuration)
94-
msbuildArguments: >-
95-
/t:AddMSBuildFilesUnixSignAndHarden;Build
96-
/p:SignType=$(MicroBuildSignType)
97-
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
98-
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
99-
condition: and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
10086
10187
- task: MSBuild@1
10288
displayName: PKG signing - sign binutils libraries
@@ -107,8 +93,7 @@ steps:
10793
/t:AddBinUtilsFilesUnixSign;Build
10894
/p:SignType=$(MicroBuildSignType)
10995
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
110-
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
111-
condition: and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
96+
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-lib.binlog
11297
11398
- task: MSBuild@1
11499
displayName: PKG signing - sign binutils executables
@@ -119,8 +104,7 @@ steps:
119104
/t:AddBinUtilsFilesUnixSignAndHarden;Build
120105
/p:SignType=$(MicroBuildSignType)
121106
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
122-
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
123-
condition: and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
107+
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
124108
125109
- script: make create-installers CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}'
126110
workingDirectory: ${{ parameters.xaSourcePath }}
@@ -132,32 +116,6 @@ steps:
132116
artifactName: ${{ parameters.nugetArtifactName }}
133117
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
134118

135-
- script: >
136-
mkdir -p bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
137-
cp bin/Build$(XA.Build.Configuration)/*.vsix bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
138-
cp bin/Build$(XA.Build.Configuration)/*.pkg bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
139-
workingDirectory: ${{ parameters.xaSourcePath }}
140-
displayName: copy unsigned installers
141-
142-
- script: >
143-
VERSION=`LANG=C; export LANG && git log --no-color --first-parent -n1 --pretty=format:%ct` &&
144-
echo "d1ec039f-f3db-468b-a508-896d7c382999 $VERSION" > bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)/updateinfo
145-
workingDirectory: ${{ parameters.xaSourcePath }}
146-
displayName: create updateinfo file
147-
148-
- task: PublishPipelineArtifact@1
149-
displayName: upload installers
150-
inputs:
151-
artifactName: ${{ parameters.installerArtifactName }}
152-
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
153-
154-
# Upload test assemblies
155-
- script: >
156-
cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests &&
157-
cp bin/Build$(XA.Build.Configuration)/ProfileAssemblies.projitems bin/Test$(XA.Build.Configuration)/bcl-tests/
158-
workingDirectory: ${{ parameters.xaSourcePath }}
159-
displayName: copy bcl-tests assemblies
160-
161119
- task: PublishPipelineArtifact@1
162120
displayName: upload test assemblies
163121
inputs:

build-tools/automation/yaml-templates/run-msbuild-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727

2828
- template: setup-test-environment.yaml
2929
parameters:
30-
provisionClassic: false
3130
installTestSlicer: true
3231
installLegacyDotNet: false
3332
restoreNUnitConsole: false

build-tools/automation/yaml-templates/setup-test-environment.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
parameters:
22
configuration: $(XA.Build.Configuration)
3-
provisionClassic: true
4-
provisionExtraArgs: -vv -f
5-
provisionatorChannel: latest
63
xaSourcePath: $(System.DefaultWorkingDirectory)
74
updateVS: false
85
jdkTestFolder: $(JAVA_HOME_11_X64)
@@ -26,12 +23,6 @@ steps:
2623
parameters:
2724
xasourcePath: ${{ parameters.xaSourcePath }}
2825

29-
- ${{ if eq(parameters.provisionClassic, true) }}:
30-
- template: run-installer.yaml
31-
parameters:
32-
provisionExtraArgs: ${{ parameters.provisionExtraArgs }}
33-
provisionatorChannel: ${{ parameters.provisionatorChannel }}
34-
3526
- script: |
3627
echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
3728
echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"

build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ stages:
2424
steps:
2525
- template: setup-test-environment.yaml
2626
parameters:
27-
provisionClassic: false
28-
provisionatorChannel: ${{ parameters.provisionatorChannel }}
2927
installTestSlicer: true
3028
installApkDiff: false
3129
installLegacyDotNet: false
@@ -81,8 +79,6 @@ stages:
8179
steps:
8280
- template: setup-test-environment.yaml
8381
parameters:
84-
provisionClassic: false
85-
provisionatorChannel: ${{ parameters.provisionatorChannel }}
8682
configuration: $(XA.Build.Configuration)
8783
installApkDiff: false
8884
installLegacyDotNet: false

build-tools/installers/sign-content.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ourself (using an empty signing identity) before passing these files to ESRP.
3737

3838
<Target Name="AddMSBuildFilesUnixSign" >
3939
<ItemGroup>
40-
<FilesToSign Include="@(_MSBuildFilesUnixSign)">
40+
<FilesToSign Include="@(_MSBuildFilesUnixSign)" Condition=" '%(_MSBuildFilesUnixSign.ExcludeFromAndroidNETSdk)' != 'true' ">
4141
<Authenticode>MacDeveloperVNext</Authenticode>
4242
<Zip>true</Zip>
4343
</FilesToSign>
@@ -46,7 +46,7 @@ ourself (using an empty signing identity) before passing these files to ESRP.
4646

4747
<Target Name="AddMSBuildFilesUnixSignAndHarden" >
4848
<ItemGroup>
49-
<FilesToSign Include="@(_MSBuildFilesUnixSignAndHarden)">
49+
<FilesToSign Include="@(_MSBuildFilesUnixSignAndHarden)" Condition=" '%(_MSBuildFilesUnixSignAndHarden.ExcludeFromAndroidNETSdk)' != 'true' ">
5050
<Authenticode>MacDeveloperVNextHarden</Authenticode>
5151
<Zip>true</Zip>
5252
</FilesToSign>

build-tools/scripts/Packaging.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ USE_COMMERCIAL_INSTALLER_NAME=true
55
EXPERIMENTAL=false
66
endif
77

8-
create-installers: create-nupkgs create-pkg create-vsix
8+
create-installers: create-nupkgs
99

1010
create-nupkgs:
1111
@echo Disk usage before create-nupkgs

0 commit comments

Comments
 (0)