diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a0405e3..179ea0d 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -40,10 +40,15 @@ steps: inputs: secureFile: 'DaxTemplate.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 b8b1ec5..08dd173 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: - main workflow_dispatch: -env: - CONFIGURATION: 'Release' + jobs: build-and-test: name: build-and-test--${{ matrix.os-version }} @@ -18,17 +18,16 @@ jobs: os-version: [windows-latest] #, ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v2 - - name: .NET setup - uses: actions/setup-dotnet@v1 + - 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.Template.sln --configuration ${{ env.CONFIGURATION }} --no-restore - - name: .NET test - run: dotnet test ./src/Dax.Template.Tests/Dax.Template.Tests.csproj --configuration ${{ env.CONFIGURATION }} --no-build --verbosity normal - - name: .NET pack - run: dotnet pack ./src/Dax.Template/Dax.Template.csproj --configuration ${{ env.CONFIGURATION }} --no-build --no-restore --verbosity normal \ No newline at end of file + - name: build + run: dotnet build ./src/Dax.Template.sln --configuration Release --no-restore + - name: test + run: dotnet test ./src/Dax.Template.Tests/Dax.Template.Tests.csproj --configuration Release --no-build --verbosity normal + - name: pack + run: dotnet pack ./src/Dax.Template/Dax.Template.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/src/Dax.Template.TestUI/Dax.Template.TestUI.csproj b/src/Dax.Template.TestUI/Dax.Template.TestUI.csproj index ab8e9c1..dc35e86 100644 --- a/src/Dax.Template.TestUI/Dax.Template.TestUI.csproj +++ b/src/Dax.Template.TestUI/Dax.Template.TestUI.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net8.0-windows enable true enable @@ -10,7 +10,7 @@ - + diff --git a/src/Dax.Template.Tests/Dax.Template.Tests.csproj b/src/Dax.Template.Tests/Dax.Template.Tests.csproj index 02c83de..4220197 100644 --- a/src/Dax.Template.Tests/Dax.Template.Tests.csproj +++ b/src/Dax.Template.Tests/Dax.Template.Tests.csproj @@ -1,21 +1,20 @@ - net6.0 - - latest + net6.0;net8.0 + 12.0 enable false - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Dax.Template/Dax.Template.csproj b/src/Dax.Template/Dax.Template.csproj index b666b71..55bb53c 100644 --- a/src/Dax.Template/Dax.Template.csproj +++ b/src/Dax.Template/Dax.Template.csproj @@ -1,9 +1,8 @@  - net6.0 - - latest + net6.0;net8.0 + 12.0 enable en-US true @@ -26,42 +25,32 @@ package-icon.png README.md MIT - https://raw.githubusercontent.com/sql-bi/DaxTemplate/main/src/package-icon.png https://github.com/sql-bi/DaxTemplate https://github.com/sql-bi/DaxTemplate + git + main true true - true embedded - false - true + + + true - + - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + $(AdditionalConstants) - - Dax.Template .NET Standard 2.0 - - - Dax.Template .NET 6.0 - - \ No newline at end of file