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
18 changes: 16 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
PUBLISH_PROJECT_PATH: TeamTools.TSQL.Linter/TeamTools.TSQL.Linter.csproj
OUTPUT_PATH: ${{ github.workspace }}/.bin/
PUBLISH_PATH: ${{ github.workspace }}/.pub
NUPKG_PATH: ${{ github.workspace }}\.nupkgs
NUPKG_PATH: ${{ github.workspace }}/.nupkgs

jobs:
semver:
Expand Down Expand Up @@ -85,6 +85,7 @@ jobs:
2.0.x
6.0.x
8.0.x
10.0.x

- name: Display dotnet version
run: dotnet --info
Expand Down Expand Up @@ -144,6 +145,11 @@ 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: Pack
if: ${{ matrix.publish }}
Expand Down Expand Up @@ -199,6 +205,14 @@ jobs:
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: Upload nugets
uses: actions/upload-artifact@v4
if: ${{ matrix.publish }}
Expand All @@ -207,7 +221,7 @@ jobs:
include-hidden-files: true
if-no-files-found: error
path: |
${{ env.NUPKG_PATH }}\*.nupkg
${{ env.NUPKG_PATH }}/*.nupkg

- name: Upload test bundle
uses: actions/upload-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ node_packages/

# Packaged items
.nupkg
.nupkgs

# Sonar temp folders
.sonarqube/
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
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
38 changes: 38 additions & 0 deletions TeamTools.TSQL.ExpressionEvaluator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,44 @@
}
}
},
"net10.0": {
"Microsoft.NETCore.Platforms": {
"type": "Direct",
"requested": "[7.0.4, )",
"resolved": "7.0.4",
"contentHash": "yLEHlNN7O5WiND89r42sepgVwy5W/ZoTiFEdJDV7MHR1lW02LL7Nipz2TD5qM/Kx9W3/k3NP+PAP2qUdOm+leg=="
},
"Microsoft.SqlServer.TransactSql.ScriptDom": {
"type": "Direct",
"requested": "[170.128.0, )",
"resolved": "170.128.0",
"contentHash": "NUN9NZaTafC1fSuLiOmfFVNomCx4E4IzA3vsfmJ7LTSy2H8fQTD01J7x3lpZ5CjA8/mKysSXXSVaMoMOVFAR9A=="
},
"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=="
},
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "13.0.4",
"contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
},
"teamtools.common.linting": {
"type": "Project",
"dependencies": {
"Microsoft.NETCore.Platforms": "[7.0.4, )",
"Newtonsoft.Json": "[13.0.4, )"
}
}
},
"net6.0": {
"Microsoft.NETCore.Platforms": {
"type": "Direct",
Expand Down
Loading
Loading