Skip to content

Commit

Permalink
Migrate tests and console demo app to .NET 7 (#72)
Browse files Browse the repository at this point in the history
* Migrate tests and console demo app to .NET 7

* Upgrade setup-msbuild action to v1.1.3
  • Loading branch information
vers-one authored Nov 24, 2022
1 parent 3c7defa commit 52666a9
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v1
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: 7

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1.3

- name: Restore dependencies
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/generate-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v1
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: 7

- name: Restore dependencies
run: dotnet restore .\Source\VersOne.Epub\VersOne.Epub.csproj
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-to-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET 6
uses: actions/setup-dotnet@v1
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: 7

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1.3

- name: Restore dependencies
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET 6
uses: actions/setup-dotnet@v1
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: 7

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1.3

- name: Restore dependencies
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v1
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
include-prerelease: true
dotnet-version: 7

- name: Build test project and its dependencies
run: dotnet build Source\VersOne.Epub.Test -c $env:Configuration
Expand Down
2 changes: 2 additions & 0 deletions Source/EpubReader.sln
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ Global
{A6ED4735-3D37-4E44-BEE4-218C6BBAC1BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6ED4735-3D37-4E44-BEE4-218C6BBAC1BD}.Release|Any CPU.Build.0 = Release|Any CPU
{2FCDA010-24D2-43E4-B58C-07E88434A966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FCDA010-24D2-43E4-B58C-07E88434A966}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FCDA010-24D2-43E4-B58C-07E88434A966}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FCDA010-24D2-43E4-B58C-07E88434A966}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
<Authors>vers</Authors>
<Copyright>vers, 2015-2022</Copyright>
Expand Down

0 comments on commit 52666a9

Please sign in to comment.