diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e0fd8bb..c724663 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,6 @@ parameters: variables: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true BuildConfiguration: Release - #codecov_token: # Get a new one from https://codecov.io/ ci_feed: https://pkgs.dev.azure.com/bretjohn-public/_packaging/bretjohn-public/nuget/v3/index.json # Azure Artifacts feed URL NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/ diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index 36da37c..c5de82e 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -3,8 +3,6 @@ parameters: type: object default: vmImage: windows-2022 -- name: includeMacOS - type: boolean - name: RunTests type: boolean default: true @@ -25,38 +23,9 @@ jobs: parameters: RunTests: ${{ parameters.RunTests }} -- job: Linux - pool: - vmImage: Ubuntu 20.04 - steps: - - checkout: self - fetchDepth: 0 # avoid shallow clone so nbgv can do its work. - clean: true - - template: install-dependencies.yml - - template: dotnet.yml - parameters: - RunTests: ${{ parameters.RunTests }} - - script: dotnet format --verify-no-changes --no-restore - displayName: 💅 Verify formatted code - -- job: macOS - condition: ${{ parameters.includeMacOS }} - pool: - vmImage: macOS-12 - steps: - - checkout: self - fetchDepth: 0 # avoid shallow clone so nbgv can do its work. - clean: true - - template: install-dependencies.yml - - template: dotnet.yml - parameters: - RunTests: ${{ parameters.RunTests }} - - job: WrapUp dependsOn: - Windows - - Linux - - macOS pool: ${{ parameters.windowsPool }} # Use Windows agent because PublishSymbols task requires it (https://github.com/microsoft/azure-pipelines-tasks/issues/13821). condition: succeededOrFailed() steps: @@ -67,10 +36,6 @@ jobs: parameters: initArgs: -NoRestore - template: publish-symbols.yml - parameters: - includeMacOS: ${{ parameters.includeMacOS }} - ${{ if parameters.RunTests }}: - template: publish-codecoverage.yml - parameters: - includeMacOS: ${{ parameters.includeMacOS }} - template: publish-deployables.yml diff --git a/azure-pipelines/publish-codecoverage.yml b/azure-pipelines/publish-codecoverage.yml index fbb6a39..75f9364 100644 --- a/azure-pipelines/publish-codecoverage.yml +++ b/azure-pipelines/publish-codecoverage.yml @@ -1,20 +1,8 @@ -parameters: - includeMacOS: - steps: - download: current artifact: coverageResults-Windows displayName: 🔻 Download Windows code coverage results continueOnError: true -- download: current - artifact: coverageResults-Linux - displayName: 🔻 Download Linux code coverage results - continueOnError: true -- download: current - artifact: coverageResults-macOS - displayName: 🔻 Download macOS code coverage results - continueOnError: true - condition: and(succeeded(), ${{ parameters.includeMacOS }}) - powershell: azure-pipelines/Merge-CodeCoverage.ps1 -Path '$(Pipeline.Workspace)' -OutputFile coveragereport/merged.cobertura.xml -Format Cobertura -Verbose displayName: ⚙ Merge coverage - task: PublishCodeCoverageResults@1 diff --git a/azure-pipelines/publish-symbols.yml b/azure-pipelines/publish-symbols.yml index 00c188f..e7fe401 100644 --- a/azure-pipelines/publish-symbols.yml +++ b/azure-pipelines/publish-symbols.yml @@ -1,6 +1,3 @@ -parameters: - includeMacOS: - steps: - task: DownloadPipelineArtifact@2 inputs: @@ -8,39 +5,6 @@ steps: path: $(Pipeline.Workspace)/symbols/Windows displayName: 🔻 Download Windows symbols continueOnError: true -- task: DownloadPipelineArtifact@2 - inputs: - artifact: symbols-Linux - path: $(Pipeline.Workspace)/symbols/Linux - displayName: 🔻 Download Linux symbols - continueOnError: true -- task: DownloadPipelineArtifact@2 - inputs: - artifact: symbols-macOS - path: $(Pipeline.Workspace)/symbols/macOS - displayName: 🔻 Download macOS symbols - continueOnError: true - condition: ${{ parameters.includeMacOS }} - -- task: DownloadPipelineArtifact@2 - inputs: - artifact: test_symbols-Windows - path: $(Pipeline.Workspace)/test_symbols/Windows - displayName: 🔻 Download Windows test symbols - continueOnError: true -- task: DownloadPipelineArtifact@2 - inputs: - artifact: test_symbols-Linux - path: $(Pipeline.Workspace)/test_symbols/Linux - displayName: 🔻 Download Linux test symbols - continueOnError: true -- task: DownloadPipelineArtifact@2 - inputs: - artifact: test_symbols-macOS - path: $(Pipeline.Workspace)/test_symbols/macOS - displayName: 🔻 Download macOS test symbols - continueOnError: true - condition: ${{ parameters.includeMacOS }} - task: PublishSymbols@2 inputs: @@ -49,11 +13,3 @@ steps: IndexSources: false SymbolServerType: TeamServices displayName: 📢 Publish symbols - -- task: PublishSymbols@2 - inputs: - SymbolsFolder: $(Pipeline.Workspace)/test_symbols - SearchPattern: '**/*.pdb' - IndexSources: false - SymbolServerType: TeamServices - displayName: 📢 Publish test symbols diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index 4c9db86..ebe98d6 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -4,7 +4,7 @@ pr: none resources: pipelines: - pipeline: CI - source: Library # TODO: This should match the name of your CI pipeline + source: maui-aspire # TODO: This should match the name of your CI pipeline trigger: tags: - auto-release @@ -38,7 +38,7 @@ jobs: - task: GitHubRelease@1 displayName: 📢 GitHub release (create) inputs: - gitHubConnection: # TODO: fill in service connection here + gitHubConnection: github.com_BretJohnson # TODO: fill in service connection here repositoryName: $(Build.Repository.Name) target: $(resources.pipeline.CI.sourceCommit) tagSource: userSpecifiedTag