Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
3.1.x
6.0.x
8.0.x
10.0.x

- name: Display dotnet version
run: dotnet --info
Expand Down Expand Up @@ -140,24 +141,43 @@ jobs:
-p:Configuration=${{ matrix.configuration }}
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
-p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net8.0"
&& dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
-p:TargetFramework=net10.0
-p:Configuration=${{ matrix.configuration }}
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
-p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net10.0"

- name: Upload build for netcoreapp3.1
- name: Upload build artifacts netcore3.1
uses: actions/upload-artifact@v4
if: ${{ matrix.publish }}
with:
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-netcoreapp3.1
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/netcoreapp3.1
if-no-files-found: error

- name: Upload build for net6.0
- name: Upload build artifacts 6.0
uses: actions/upload-artifact@v4
if: ${{ matrix.publish }}
with:
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net6.0
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net6.0
if-no-files-found: error

- name: Upload build for net8.0
- name: Upload build artifacts 8.0
uses: actions/upload-artifact@v4
if: ${{ matrix.publish }}
with:
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net8.0
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net8.0
if-no-files-found: error

- name: Upload build artifacts 10.0
uses: actions/upload-artifact@v4
if: ${{ matrix.publish }}
with:
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net10.0
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net10.0
if-no-files-found: error

- name: Test
if: ${{ !matrix.coverage }}
Expand All @@ -182,6 +202,7 @@ jobs:
with:
name: test-results
path: TestResults
if-no-files-found: error

- name: Test Report
uses: dorny/test-reporter@v2
Expand All @@ -190,6 +211,7 @@ jobs:
name: NUnit testing ${{ matrix.configuration }} build on ${{ matrix.os }}
path: "**/TestResults/*.trx,*.trx"
reporter: dotnet-trx
if-no-files-found: error

validate-markdown:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -220,6 +242,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Download test results
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -265,14 +288,16 @@ jobs:
fail-fast: false
matrix:
configuration: [Release]
dotnet: [netstandard2.0, net6.0, net8.0]
dotnet: [netstandard2.0, net6.0, net8.0, net10.0]
include:
- dotnet: netstandard2.0
app-dotnet: netcoreapp3.1
- dotnet: net6.0
app-dotnet: net6.0
- dotnet: net8.0
app-dotnet: net8.0
- dotnet: netstandard2.0
app-dotnet: netcoreapp3.1
- dotnet: net10.0
app-dotnet: net10.0

steps:
- name: Grab CLI ${{ matrix.app-dotnet }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
Expand Down
45 changes: 39 additions & 6 deletions TeamTools.Linter.CommandLine/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,9 @@
"resolved": "7.0.0",
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==",
"dependencies": {
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
Expand All @@ -60,6 +54,45 @@
}
}
},
"net10.0": {
"CommandLineParser": {
"type": "Direct",
"requested": "[2.9.1, )",
"resolved": "2.9.1",
"contentHash": "OE0sl1/sQ37bjVsPKKtwQlWDgqaxWgtme3xZz7JssWUzg5JpMIyHgCTY9MVMxOg48fJ1AgGT3tgdH5m/kQ5xhA=="
},
"Microsoft.NETCore.Platforms": {
"type": "Direct",
"requested": "[7.0.4, )",
"resolved": "7.0.4",
"contentHash": "yLEHlNN7O5WiND89r42sepgVwy5W/ZoTiFEdJDV7MHR1lW02LL7Nipz2TD5qM/Kx9W3/k3NP+PAP2qUdOm+leg=="
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.4, )",
"resolved": "13.0.4",
"contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
},
"Roslynator.Analyzers": {
"type": "Direct",
"requested": "[4.14.1, )",
"resolved": "4.14.1",
"contentHash": "yMSjze/xMYDF6PCE60/ULWx0tttNyKAndw2KijNxbKil0FX8nvDeEneDZGma8Uifk17RlfZqIXxf1mmBmhRHjg=="
},
"StyleCop.Analyzers": {
"type": "Direct",
"requested": "[1.1.118, )",
"resolved": "1.1.118",
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
},
"teamtools.common.linting": {
"type": "Project",
"dependencies": {
"Microsoft.NETCore.Platforms": "[7.0.4, )",
"Newtonsoft.Json": "[13.0.4, )"
}
}
},
"net6.0": {
"CommandLineParser": {
"type": "Direct",
Expand Down
2 changes: 1 addition & 1 deletion TeamTools.TSQL.Common/TeamTools.Common.Linting.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
<OutputType>Library</OutputType>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
Expand Down
26 changes: 26 additions & 0 deletions TeamTools.TSQL.Common/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,32 @@
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
}
},
"net10.0": {
"Microsoft.NETCore.Platforms": {
"type": "Direct",
"requested": "[7.0.4, )",
"resolved": "7.0.4",
"contentHash": "yLEHlNN7O5WiND89r42sepgVwy5W/ZoTiFEdJDV7MHR1lW02LL7Nipz2TD5qM/Kx9W3/k3NP+PAP2qUdOm+leg=="
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.4, )",
"resolved": "13.0.4",
"contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
},
"Roslynator.Analyzers": {
"type": "Direct",
"requested": "[4.14.1, )",
"resolved": "4.14.1",
"contentHash": "yMSjze/xMYDF6PCE60/ULWx0tttNyKAndw2KijNxbKil0FX8nvDeEneDZGma8Uifk17RlfZqIXxf1mmBmhRHjg=="
},
"StyleCop.Analyzers": {
"type": "Direct",
"requested": "[1.1.118, )",
"resolved": "1.1.118",
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
}
},
"net6.0": {
"Microsoft.NETCore.Platforms": {
"type": "Direct",
Expand Down
Loading