Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

Commit abbe2b5

Browse files
pascalbergerpascalberger
authored
(GH-129) Multi-Target .NET Core 3.1, 5 & 6 instead of .NET Standard 2.0 (#136)
* (GH-129) Multi-Target .NET Core 3.1, 5 & 6 instead of .NET Standard 2.0 * Remove netfx / mono int tests
1 parent 4384fb4 commit abbe2b5

File tree

7 files changed

+36
-509
lines changed

7 files changed

+36
-509
lines changed

‎azure-pipelines.yml

Lines changed: 3 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,6 @@ jobs:
2020
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
2121
artifact: NuGet Package
2222
displayName: 'Publish NuGet package as build artifact'
23-
# Integration Tests Windows (.NET Framework)
24-
- job: Test_Windows_DotNetFramework
25-
displayName: 'Integration Tests Windows (.NET Framework)'
26-
dependsOn: Build
27-
pool:
28-
vmImage: 'windows-2019'
29-
steps:
30-
- task: NodeTool@0
31-
inputs:
32-
versionSpec: '14.x'
33-
displayName: 'Install NodeJs 14.x'
34-
- powershell: choco install markdownlint-cli --no-progress
35-
displayName: 'Install required tools'
36-
- download: current
37-
artifact: NuGet Package
38-
displayName: 'Download build artifact'
39-
- task: CopyFiles@2
40-
inputs:
41-
sourceFolder: $(Pipeline.Workspace)/NuGet Package
42-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
43-
displayName: 'Copy build artifact for test run'
44-
- powershell: ./build.ps1 -verbosity diagnostic
45-
workingDirectory: ./tests/
46-
displayName: 'Run integration tests'
47-
- publish: $(Build.SourcesDirectory)/tests/output
48-
artifact: Integration Tests Windows (.NET Framework)
49-
displayName: 'Publish generated reports as build artifact'
5023
# Integration Tests Windows (.NET Core tool)
5124
- job: Test_Windows_DotNetCoreTool
5225
displayName: Integration Tests Windows (.NET Core tool)
@@ -68,10 +41,7 @@ jobs:
6841
sourceFolder: $(Pipeline.Workspace)/NuGet Package
6942
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
7043
displayName: 'Copy build artifact for test run'
71-
- powershell: dotnet tool restore
72-
workingDirectory: ./tests/
73-
displayName: 'Restore .NET Core tool'
74-
- powershell: dotnet cake
44+
- powershell: ./build.ps1 --verbosity=diagnostic
7545
workingDirectory: ./tests/
7646
displayName: 'Run integration tests'
7747
- publish: $(Build.SourcesDirectory)/tests/output
@@ -87,40 +57,6 @@ jobs:
8757
inputs:
8858
pathToPublish: '$(Build.ArtifactStagingDirectory)'
8959
artifactName: CodeAnalysisLogs
90-
# Integration Tests macOS 10.14 (Mono)
91-
- job: Test_macOS_Mono
92-
displayName: 'Integration Tests macOS 10.14 (Mono)'
93-
dependsOn: Build
94-
pool:
95-
vmImage: 'macOS-10.14'
96-
steps:
97-
- task: NodeTool@0
98-
inputs:
99-
versionSpec: '14.x'
100-
displayName: 'Install NodeJs 14.x'
101-
- bash: |
102-
npm install -g markdownlint-cli
103-
displayName: 'Install required tools'
104-
# To manually select a Xamarin SDK version on the Hosted macOS agent, enable this script with the SDK version you want to target
105-
# https://go.microsoft.com/fwlink/?linkid=871629
106-
- bash: |
107-
sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 5_18_1
108-
displayName: 'Select Mono 5.18.1'
109-
- download: current
110-
artifact: NuGet Package
111-
displayName: 'Download build artifact'
112-
- task: CopyFiles@2
113-
inputs:
114-
sourceFolder: $(Pipeline.Workspace)/NuGet Package
115-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
116-
displayName: 'Copy build artifact for test run'
117-
- bash: |
118-
./build.sh --verbosity diagnostic
119-
workingDirectory: ./tests/
120-
displayName: 'Run integration tests'
121-
- publish: $(Build.SourcesDirectory)/tests/output
122-
artifact: Integration Tests macOS 10.14 (Mono)
123-
displayName: 'Publish generated reports as build artifact'
12460
# Integration Tests macOS 10.15 (.NET Core tool)
12561
- job: Test_macOS_DotNetCoreTool
12662
displayName: Integration Tests macOS 10.15 (.NET Core tool)
@@ -143,46 +79,12 @@ jobs:
14379
sourceFolder: $(Pipeline.Workspace)/NuGet Package
14480
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
14581
displayName: 'Copy build artifact for test run'
146-
- bash: |
147-
dotnet tool restore
148-
workingDirectory: ./tests/
149-
displayName: 'Restore .NET Core tool'
150-
- bash: |
151-
dotnet cake
82+
- powershell: ./build.ps1 --verbosity=diagnostic
15283
workingDirectory: ./tests/
15384
displayName: 'Run integration tests'
15485
- publish: $(Build.SourcesDirectory)/tests/output
15586
artifact: Integration Tests macOS 10.15 (.NET Core tool)
15687
displayName: 'Publish generated reports as build artifact'
157-
# Integration Tests Ubuntu 16.04 (Mono)
158-
- job: Test_ubuntu_Mono
159-
displayName: 'Integration Tests Ubuntu 16.04 (Mono)'
160-
dependsOn: Build
161-
pool:
162-
vmImage: 'ubuntu-16.04'
163-
steps:
164-
- task: NodeTool@0
165-
inputs:
166-
versionSpec: '14.x'
167-
displayName: 'Install NodeJs 14.x'
168-
- bash: |
169-
npm install -g markdownlint-cli
170-
displayName: 'Install required tools'
171-
- download: current
172-
artifact: NuGet Package
173-
displayName: 'Download build artifact'
174-
- task: CopyFiles@2
175-
inputs:
176-
sourceFolder: $(Pipeline.Workspace)/NuGet Package
177-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
178-
displayName: 'Copy build artifact for test run'
179-
- bash: |
180-
./build.sh --verbosity diagnostic
181-
workingDirectory: ./tests/
182-
displayName: 'Run integration tests'
183-
- publish: $(Build.SourcesDirectory)/tests/output
184-
artifact: Integration Tests Ubuntu 16.04 (Mono)
185-
displayName: 'Publish generated reports as build artifact'
18688
# Integration Tests Ubuntu 16.04 (.NET Core tool)
18789
- job: Test_ubuntu_DotNetCoreTool
18890
displayName: Integration Tests Ubuntu 16.04 (.NET Core tool)
@@ -205,12 +107,7 @@ jobs:
205107
sourceFolder: $(Pipeline.Workspace)/NuGet Package
206108
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
207109
displayName: 'Copy build artifact for test run'
208-
- bash: |
209-
dotnet tool restore
210-
workingDirectory: ./tests/
211-
displayName: 'Restore .NET Core tool'
212-
- bash: |
213-
dotnet cake
110+
- powershell: ./build.ps1 --verbosity=diagnostic
214111
workingDirectory: ./tests/
215112
displayName: 'Run integration tests'
216113
- publish: $(Build.SourcesDirectory)/tests/output

‎nuspec/nuget/Cake.Issues.Reporting.Sarif.nuspec

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,17 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
2626
</metadata>
2727
<files>
2828
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
29-
<file src="netstandard2.0/Cake.Issues.Reporting.Sarif.dll" target="lib\netstandard2.0" />
30-
<file src="netstandard2.0/Cake.Issues.Reporting.Sarif.pdb" target="lib\netstandard2.0" />
31-
<file src="netstandard2.0/Cake.Issues.Reporting.Sarif.xml" target="lib\netstandard2.0" />
32-
<file src="netstandard2.0/Sarif.dll" target="lib\netstandard2.0" />
29+
<file src="netcoreapp3.1/Cake.Issues.Reporting.Sarif.dll" target="lib\netcoreapp3.1" />
30+
<file src="netcoreapp3.1/Cake.Issues.Reporting.Sarif.pdb" target="lib\netcoreapp3.1" />
31+
<file src="netcoreapp3.1/Cake.Issues.Reporting.Sarif.xml" target="lib\netcoreapp3.1" />
32+
<file src="netcoreapp3.1/Sarif.dll" target="lib\netcoreapp3.1" />
33+
<file src="net5.0/Cake.Issues.Reporting.Sarif.dll" target="lib\net5.0" />
34+
<file src="net5.0/Cake.Issues.Reporting.Sarif.pdb" target="lib\net5.0" />
35+
<file src="net5.0/Cake.Issues.Reporting.Sarif.xml" target="lib\net5.0" />
36+
<file src="net5.0/Sarif.dll" target="lib\net5.0" />
37+
<file src="net6.0/Cake.Issues.Reporting.Sarif.dll" target="lib\net6.0" />
38+
<file src="net6.0/Cake.Issues.Reporting.Sarif.pdb" target="lib\net6.0" />
39+
<file src="net6.0/Cake.Issues.Reporting.Sarif.xml" target="lib\net6.0" />
40+
<file src="net6.0/Sarif.dll" target="lib\net5.0" />
3341
</files>
3442
</package>

‎src/Cake.Issues.Reporting.Sarif.Tests/Cake.Issues.Reporting.Sarif.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<Description>Tests for the Cake.Issues.Reporting.Sarif addin</Description>
88
<Authors>Pascal Berger</Authors>

‎src/Cake.Issues.Reporting.Sarif/Cake.Issues.Reporting.Sarif.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
<Description>Support for creating SARIF compatible files for the Cake.Issues addin for Cake Build Automation System</Description>
77
<Authors>Pascal Berger</Authors>
88
<Product>Cake.Issues</Product>

0 commit comments

Comments
 (0)