diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 246e134..e8e06a9 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -40,10 +40,15 @@ steps:
inputs:
secureFile: 'DaxFormatter.snk'
- task: UseDotNet@2
- displayName: '.NET setup'
+ displayName: 'Install .NET SDK'
inputs:
packageType: sdk
- version: 6.0.x
+ useGlobalJson: true
+- task: UseDotNet@2
+ displayName: 'Install .NET 6.0 runtime'
+ inputs:
+ packageType: runtime
+ version: '6.0.x'
- task: DotNetCoreCLI@2
displayName: '.NET restore'
inputs:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..e402d0d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+ - package-ecosystem: "nuget"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ open-pull-requests-limit: 10
+ assignees:
+ - "albertospelta"
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ open-pull-requests-limit: 10
+ assignees:
+ - "albertospelta"
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5b46522..bba9830 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,5 @@
-name: CI
+name: ci
+
on:
push:
branches:
@@ -7,8 +8,7 @@ on:
branches:
- master
workflow_dispatch:
-env:
- CONFIGURATION: 'Release'
+
jobs:
build-and-test:
name: build-and-test--${{ matrix.os-version }}
@@ -17,18 +17,17 @@ jobs:
matrix:
os-version: [windows-latest] #, ubuntu-latest, macos-latest]
steps:
- - uses: actions/checkout@v2
- - name: .NET setup
- uses: actions/setup-dotnet@v1
+ - uses: actions/checkout@v4
+ - uses: actions/setup-dotnet@v4
with:
- dotnet-version: 6.0.x
- - name: .NET info
- run: dotnet --info
- - name: .NET restore
+ dotnet-version: |
+ 6.0.x
+ global-json-file: global.json
+ - name: restore
run: dotnet restore ./src
- - name: .NET build
- run: dotnet build ./src/Dax.Formatter.sln --configuration ${{ env.CONFIGURATION }} --no-restore
- - name: .NET test
- run: dotnet test ./src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj --configuration ${{ env.CONFIGURATION }} --no-build --verbosity normal
- - name: .NET pack
- run: dotnet pack ./src/Dax.Formatter/Dax.Formatter.csproj --configuration ${{ env.CONFIGURATION }} --no-build --no-restore --verbosity normal
\ No newline at end of file
+ - name: build
+ run: dotnet build ./src/Dax.Formatter.sln --configuration Release --no-restore
+ - name: test
+ run: dotnet test ./src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj --configuration Release --no-build --verbosity normal
+ - name: pack
+ run: dotnet pack ./src/Dax.Formatter/Dax.Formatter.csproj --configuration Release --no-build --no-restore --verbosity normal
\ No newline at end of file
diff --git a/global.json b/global.json
index fe1d243..4ccdb21 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "6.0.100",
+ "version": "8.0.400",
"allowPrerelease": false,
"rollForward": "latestFeature"
}
diff --git a/samples/getting-started/BasicFormatter.csproj b/samples/getting-started/BasicFormatter.csproj
index 4e4ad2e..1382696 100644
--- a/samples/getting-started/BasicFormatter.csproj
+++ b/samples/getting-started/BasicFormatter.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp3.1
+ net8.0
diff --git a/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj b/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj
index c02a088..2fcf183 100644
--- a/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj
+++ b/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj
@@ -1,7 +1,7 @@
- net472;net6.0
+ net472;net6.0;net8.0
latest
enable
false
diff --git a/src/Dax.Formatter.Tests/Security/SecurityHelpersTests.cs b/src/Dax.Formatter.Tests/Security/SecurityHelpersTests.cs
index 72f4c18..21c2778 100644
--- a/src/Dax.Formatter.Tests/Security/SecurityHelpersTests.cs
+++ b/src/Dax.Formatter.Tests/Security/SecurityHelpersTests.cs
@@ -11,7 +11,7 @@ public class SecurityHelpersTests
[InlineData("abcdefghiABCDEFGHI??=", "1bca6736f96f84e35fa921938f45ba981a6e3f6aa02bcf46763009d3614cf89d")]
[InlineData("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
[InlineData(null, null)]
- public void SecurityHelpers_ToHashSHA256_ComputeCorrectResult(string value, string expected)
+ public void SecurityHelpers_ToHashSHA256_ComputeCorrectResult(string? value, string? expected)
{
var actual = value.ToHashSHA256();
Assert.Equal(expected, actual);
diff --git a/src/Dax.Formatter/Dax.Formatter.csproj b/src/Dax.Formatter/Dax.Formatter.csproj
index e5aa8e1..8aae777 100644
--- a/src/Dax.Formatter/Dax.Formatter.csproj
+++ b/src/Dax.Formatter/Dax.Formatter.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;net6.0
+ netstandard2.0;net6.0;net8.0
latest
enable
en-US
@@ -25,14 +25,16 @@
package-icon.png
README.md
MIT
- https://raw.githubusercontent.com/sql-bi/DaxFormatter/master/src/package-icon.png
https://github.com/sql-bi/DaxFormatter
https://github.com/sql-bi/DaxFormatter
+ git
+ master
true
true
- true
- snupkg
- true
+ embedded
+
+
+
true
@@ -43,12 +45,8 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
@@ -61,5 +59,8 @@
Dax.Formatter .NET 6.0
+
+ Dax.Formatter .NET 8.0
+
\ No newline at end of file