Skip to content

Commit

Permalink
Upgrade to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
Lolle2000la committed Nov 14, 2023
1 parent 6cc01e6 commit db65f46
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/ImageSort.WPF/ImageSort.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<AssemblyName>Image Sort</AssemblyName>
<Configurations>Debug;Release;MSIX</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
<IsDotnetSDKProject>True</IsDotnetSDKProject>
<TargetFrameworkIdentifier>net7.0-windows</TargetFrameworkIdentifier>
<TargetFrameworkIdentifier>net8.0-windows</TargetFrameworkIdentifier>
<Runtime>win-$(Platform)</Runtime>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ImageSort.WindowsSetup/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<File Id="LicenseRtf" Name="License.rtf" Source="License.rtf" KeyPath="yes" />
</Component>
<Component Id="ImageSortExeComponent" Guid="036C3C1A-FA77-46CD-97F9-26653E110D8F">
<File Id="ImageSortExe" Name="Image Sort.exe" Source="..\ImageSort.WPF\bin\$(var.PlatformSpecialFolder)$(var.Configuration)\net7.0-windows\win-$(var.Platform)\publish\Image Sort.exe" KeyPath="yes">
<File Id="ImageSortExe" Name="Image Sort.exe" Source="..\ImageSort.WPF\bin\$(var.PlatformSpecialFolder)$(var.Configuration)\net8.0-windows\win-$(var.Platform)\publish\Image Sort.exe" KeyPath="yes">
<Shortcut Id="StartMenuShortcut" Directory="StartMenuFolder" Name="Image Sort" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="ImageSort.exe" IconIndex="0" />
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Image Sort" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="ImageSort.exe" IconIndex="0" />
</File>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>Debug;Release;MSIX</Configurations>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ImageSort/ImageSort.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>Debug;Release;MSIX</Configurations>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/ImageSort.UnitTests/ImageSort.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</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

Expand Down
4 changes: 2 additions & 2 deletions tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.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-windows</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -26,7 +26,7 @@

<Target AfterTargets="AfterBuild" Name="IncludeEverythingFromWPFProject">
<ItemGroup>
<_CopyItems Include="$(ProjectDir)\..\..\src\ImageSort.WPF\bin\$(Configuration)\net7.0-windows\*.*" />
<_CopyItems Include="$(ProjectDir)\..\..\src\ImageSort.WPF\bin\$(Configuration)\net8.0-windows\*.*" />
</ItemGroup>
<Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
</Target>
Expand Down

0 comments on commit db65f46

Please sign in to comment.