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
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ jobs:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v2

- id: get_version
- id: get_version
uses: battila7/get-version-action@v2

- name: Build
run: msbuild /v:m /p:Configuration=Release /t:Restore,Clean,Build,Pack /p:Version=${{ steps.get_version.outputs.version-without-v }} src/ConfigSettings.sln

- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.x
dotnet-version: 8.0.x

- name: Publish the package to nuget.org
shell: cmd
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@ jobs:
runs-on: windows-2019
strategy:
matrix:
framework: [ 'netcoreapp2.0', 'net45' ]
framework: [ 'net6.0', 'net45' ]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v2

- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 2.1.x
dotnet-version: 8.0.x

- name: Install dependencies
shell: cmd
run: dotnet restore src/Tests/

- name: Test with dotnet
shell: cmd
run: dotnet test --logger trx --framework ${{ matrix.framework }} --results-directory "TestResults-${{ matrix.framework }}" src/Tests/ConfigSettingsTests.csproj
run: dotnet test --logger trx --framework ${{ matrix.framework }} --results-directory "src/Tests/TestResults-${{ matrix.framework }}" src/Tests/ConfigSettingsTests.csproj

- name: Upload dotnet test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dotnet-results-${{ matrix.framework }}
path: src/Tests/TestResults-${{ matrix.framework }}
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/ConfigSettingsTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
<TargetFrameworks>net6.0;net45</TargetFrameworks>
<AssemblyName>ConfigSettingsTests</AssemblyName>
<RootNamespace>ConfigSettingsTests</RootNamespace>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
Expand Down
Loading