Skip to content

Commit

Permalink
Merge pull request #110 from MoneyTools/clovett/net8
Browse files Browse the repository at this point in the history
  • Loading branch information
jpdup committed Nov 16, 2023
2 parents 4e6a24c + 1d1cb72 commit 6cc8c9c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 17 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/dotnet-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ jobs:
- name: Setup NuGet.exe
uses: NuGet/setup-nuget@v1

- name: Setup .NET 8
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2
Expand All @@ -79,15 +84,6 @@ jobs:
- name: Setup VSTest Path
uses: darenm/Setup-VSTest@v1.2

# - name: Install Windows SDK 10.0.18362
# uses: fbactions/setup-winsdk@v1
# with:
# winsdk-build-version: 18362

# Execute all unit tests in the solution
# - name: Execute unit tests
# run: dotnet test

# Restore the application to populate the obj folder with RuntimeIdentifiers
- name: Restore the application
run: nuget restore $env:Solution_Name
Expand All @@ -103,7 +99,7 @@ jobs:

# Test the application.
- name: Run unit tests
run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net7.0-windows\UnitTests.dll
run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net8.0-windows7.0\UnitTests.dll
env:
Configuration: ${{ matrix.configuration }}
Platform: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/MyMoney/MyMoney.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/OfxTestServer/OfxTestServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>OfxTestServer</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/ScenarioTest/ScenarioTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Walkabout.Tests</RootNamespace>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPF/UpdateVersion/UpdateVersion.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>

</PropertyGroup>
Expand Down

0 comments on commit 6cc8c9c

Please sign in to comment.