diff --git a/.github/workflows/gs1encoders.yml b/.github/workflows/gs1encoders.yml index 51b88fc..1008e21 100644 --- a/.github/workflows/gs1encoders.yml +++ b/.github/workflows/gs1encoders.yml @@ -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: @@ -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 @@ -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 @@ -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: diff --git a/src/dotnet-app/gs1encoders-dotnet-app.csproj b/src/dotnet-app/gs1encoders-dotnet-app.csproj index 996ad02..fa30802 100644 --- a/src/dotnet-app/gs1encoders-dotnet-app.csproj +++ b/src/dotnet-app/gs1encoders-dotnet-app.csproj @@ -1,8 +1,9 @@ - + WinExe - netcoreapp3.1 + net8.0-windows + win-x86 gs1encoders_dotnet_app true GS1.EncodersApp.App diff --git a/src/dotnet-lib/Properties/AssemblyInfo.cs b/src/dotnet-lib/Properties/AssemblyInfo.cs deleted file mode 100644 index 76f0848..0000000 --- a/src/dotnet-lib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("gs1encoders-dotnet")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("gs1encoders-dotnet")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/dotnet-lib/Properties/Resources.Designer.cs b/src/dotnet-lib/Properties/Resources.Designer.cs deleted file mode 100644 index feffd56..0000000 --- a/src/dotnet-lib/Properties/Resources.Designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -namespace gs1encoders_dotnet.Properties -{ - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("gs1encoders_dotnet.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/src/dotnet-lib/Properties/Resources.resx b/src/dotnet-lib/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/src/dotnet-lib/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/src/dotnet-lib/Properties/Settings.Designer.cs b/src/dotnet-lib/Properties/Settings.Designer.cs deleted file mode 100644 index a7d2f5c..0000000 --- a/src/dotnet-lib/Properties/Settings.Designer.cs +++ /dev/null @@ -1,29 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -namespace gs1encoders_dotnet.Properties -{ - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/src/dotnet-lib/Properties/Settings.settings b/src/dotnet-lib/Properties/Settings.settings deleted file mode 100644 index 033d7a5..0000000 --- a/src/dotnet-lib/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/dotnet-lib/gs1encoders-dotnet-lib.csproj b/src/dotnet-lib/gs1encoders-dotnet-lib.csproj index 915d552..51b27bc 100644 --- a/src/dotnet-lib/gs1encoders-dotnet-lib.csproj +++ b/src/dotnet-lib/gs1encoders-dotnet-lib.csproj @@ -1,92 +1,25 @@ - - - + + - Debug - AnyCPU - {EFBE8189-27F9-48C6-85A9-1221151BCB00} Library + net8.0 gs1encoders_dotnet gs1encoders-dotnet - v4.7.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true + false + - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - bin\Debug\gs1encoders-dotnet.xml + x86 true + x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false true - - - - - - - - - - - - - - - 4.0 - - - - - - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - xcopy /y /d "..\..\..\c-lib\build\library\Win32\$(Configuration)\gs1encoders.dll" "." - + + + + + \ No newline at end of file