Skip to content

Commit

Permalink
MSVC: Retarget to .NET 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
terryburton committed Oct 5, 2024
1 parent 5eb5e02 commit 7a7e481
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 363 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gs1encoders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
copy src\c-lib\gs1-syntax-dictionary.txt .
src\c-lib\build\console-app\Win32\Release\gs1encoders-app.exe --version
src\dotnet-app\bin\Release\netcoreapp3.1\gs1encoders-dotnet-app.exe --version
src\dotnet-app\bin\Release\net8.0-windows\gs1encoders-dotnet-app.exe --version
ci-macos:

Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
- name: Windows release build
run: |
msbuild /t:Restore,Build /p:Configuration=release /p:Platform="x86" /p:RuntimeIdentifier=win-x86 /warnaserror src\gs1encoders.sln
msbuild /p:Configuration=release /p:Platform="x86" /p:PublishSingleFile=True /p:SelfContained=True /p:RuntimeIdentifier=win-x86 /p:PublishDir=bin\Release\netcoreapp3.1\win-x86\publish\ /warnaserror src\gs1encoders.sln -target:gs1encoders-dotnet-app:Publish
msbuild /p:Configuration=release /p:Platform="x86" /p:PublishSingleFile=True /p:SelfContained=True /p:RuntimeIdentifier=win-x86 /p:PublishDir=bin\Release\net8.0-windows\win-x86\publish\ /warnaserror src\gs1encoders.sln -target:gs1encoders-dotnet-app:Publish
- name: ZIP development libs
working-directory: src/c-lib/build/library/Win32/Release
Expand All @@ -338,7 +338,7 @@ jobs:
path: src/c-lib/build/console-app/Win32/Release/gs1encoders-windows-console-app.zip

- name: ZIP GUI application
working-directory: src/dotnet-app/bin/Release\netcoreapp3.1\win-x86\publish
working-directory: src/dotnet-app/bin/Release\net8.0-windows\win-x86\publish
run: |
7z a gs1encoders-windows-gui-app.zip gs1encoders-dotnet-app.exe ../../gs1encoders.dll ../../../../../../c-lib/gs1-syntax-dictionary.txt
Expand All @@ -347,7 +347,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: windows-gui-app
path: src/dotnet-app/bin/Release/netcoreapp3.1/win-x86/publish/gs1encoders-windows-gui-app.zip
path: src/dotnet-app/bin/Release/net8.0-windows/win-x86/publish/gs1encoders-windows-gui-app.zip


build-release-linux:
Expand Down
5 changes: 3 additions & 2 deletions src/dotnet-app/gs1encoders-dotnet-app.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
<RootNamespace>gs1encoders_dotnet_app</RootNamespace>
<UseWPF>true</UseWPF>
<StartupObject>GS1.EncodersApp.App</StartupObject>
Expand Down
55 changes: 0 additions & 55 deletions src/dotnet-lib/Properties/AssemblyInfo.cs

This file was deleted.

70 changes: 0 additions & 70 deletions src/dotnet-lib/Properties/Resources.Designer.cs

This file was deleted.

117 changes: 0 additions & 117 deletions src/dotnet-lib/Properties/Resources.resx

This file was deleted.

29 changes: 0 additions & 29 deletions src/dotnet-lib/Properties/Settings.Designer.cs

This file was deleted.

7 changes: 0 additions & 7 deletions src/dotnet-lib/Properties/Settings.settings

This file was deleted.

Loading

0 comments on commit 7a7e481

Please sign in to comment.