diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6e5b2f2..16ddce0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -52,4 +52,4 @@ jobs: - name: Build solution shell: pwsh - run: msbuild $env:Solution_Name -p:Configuration=${{ matrix.configuration }} -p:Platform="Any CPU" + run: msbuild $env:Solution_Name -p:Configuration=${{ matrix.configuration }} -p:Platform="x64" diff --git a/DisplayPluginLibrary/DisplayPluginLibrary.csproj b/DisplayPluginLibrary/DisplayPluginLibrary.csproj index ab157b4..d105962 100644 --- a/DisplayPluginLibrary/DisplayPluginLibrary.csproj +++ b/DisplayPluginLibrary/DisplayPluginLibrary.csproj @@ -1,20 +1,20 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 - + - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" - + + + \ No newline at end of file diff --git a/DriverDisplayPlugin/DriverDisplayPlugin.csproj b/DriverDisplayPlugin/DriverDisplayPlugin.csproj index 33edb57..8838c27 100644 --- a/DriverDisplayPlugin/DriverDisplayPlugin.csproj +++ b/DriverDisplayPlugin/DriverDisplayPlugin.csproj @@ -1,11 +1,11 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 @@ -14,15 +14,15 @@ - + - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" - + + + \ No newline at end of file diff --git a/EnhancedDisplayPlugin/EnhancedDisplayPlugin.csproj b/EnhancedDisplayPlugin/EnhancedDisplayPlugin.csproj index 5d21b14..4ed5105 100644 --- a/EnhancedDisplayPlugin/EnhancedDisplayPlugin.csproj +++ b/EnhancedDisplayPlugin/EnhancedDisplayPlugin.csproj @@ -1,14 +1,14 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 - + @@ -18,11 +18,11 @@ - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" - + + + \ No newline at end of file diff --git a/MAT.Atlas.Plugins.Samples.HelloConsole/MAT.Atlas.Plugins.Samples.HelloConsole.csproj b/MAT.Atlas.Plugins.Samples.HelloConsole/MAT.Atlas.Plugins.Samples.HelloConsole.csproj index 0d81a01..fc5098f 100644 --- a/MAT.Atlas.Plugins.Samples.HelloConsole/MAT.Atlas.Plugins.Samples.HelloConsole.csproj +++ b/MAT.Atlas.Plugins.Samples.HelloConsole/MAT.Atlas.Plugins.Samples.HelloConsole.csproj @@ -1,22 +1,25 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 - + - + - + + + + \ No newline at end of file diff --git a/MAT.Atlas.Plugins.Samples.HelloWorld/MAT.Atlas.Plugins.Samples.HelloWorld.csproj b/MAT.Atlas.Plugins.Samples.HelloWorld/MAT.Atlas.Plugins.Samples.HelloWorld.csproj index 28db9d2..a252fd8 100644 --- a/MAT.Atlas.Plugins.Samples.HelloWorld/MAT.Atlas.Plugins.Samples.HelloWorld.csproj +++ b/MAT.Atlas.Plugins.Samples.HelloWorld/MAT.Atlas.Plugins.Samples.HelloWorld.csproj @@ -1,22 +1,24 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 - + - + - + + + \ No newline at end of file diff --git a/MAT.OCS.Atlas10.ClientAPI.sln b/MAT.OCS.Atlas10.ClientAPI.sln index 413c664..bdd6de3 100644 --- a/MAT.OCS.Atlas10.ClientAPI.sln +++ b/MAT.OCS.Atlas10.ClientAPI.sln @@ -44,42 +44,42 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{02EA68 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Debug|Any CPU.Build.0 = Debug|Any CPU - {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Release|Any CPU.ActiveCfg = Release|Any CPU - {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Release|Any CPU.Build.0 = Release|Any CPU - {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Release|Any CPU.Build.0 = Release|Any CPU - {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Release|Any CPU.Build.0 = Release|Any CPU - {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Release|Any CPU.Build.0 = Release|Any CPU - {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Release|Any CPU.Build.0 = Release|Any CPU - {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Release|Any CPU.Build.0 = Release|Any CPU - {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Release|Any CPU.Build.0 = Release|Any CPU - {899080EB-4531-438A-97C0-DDC890DFA5B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {899080EB-4531-438A-97C0-DDC890DFA5B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {899080EB-4531-438A-97C0-DDC890DFA5B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {899080EB-4531-438A-97C0-DDC890DFA5B1}.Release|Any CPU.Build.0 = Release|Any CPU + {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Debug|x64.ActiveCfg = Debug|x64 + {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Debug|x64.Build.0 = Debug|x64 + {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Release|x64.ActiveCfg = Release|x64 + {731083C3-DDEA-4F94-82BE-BE20E9CAA299}.Release|x64.Build.0 = Release|x64 + {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Debug|x64.ActiveCfg = Debug|x64 + {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Debug|x64.Build.0 = Debug|x64 + {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Release|x64.ActiveCfg = Release|x64 + {D1B7382E-D7E3-43C1-A99A-C48407145FFC}.Release|x64.Build.0 = Release|x64 + {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Debug|x64.ActiveCfg = Debug|x64 + {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Debug|x64.Build.0 = Debug|x64 + {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Release|x64.ActiveCfg = Release|x64 + {273CDD90-1FA3-4953-B4C6-2C2091D6BB50}.Release|x64.Build.0 = Release|x64 + {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Debug|x64.ActiveCfg = Debug|x64 + {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Debug|x64.Build.0 = Debug|x64 + {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Release|x64.ActiveCfg = Release|x64 + {C2F063D2-7539-4C77-9DDD-E135F67049D8}.Release|x64.Build.0 = Release|x64 + {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Debug|x64.ActiveCfg = Debug|x64 + {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Debug|x64.Build.0 = Debug|x64 + {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Release|x64.ActiveCfg = Release|x64 + {7F7D8F62-47B9-4A98-BA03-C479EDB70EDB}.Release|x64.Build.0 = Release|x64 + {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Debug|x64.ActiveCfg = Debug|x64 + {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Debug|x64.Build.0 = Debug|x64 + {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Release|x64.ActiveCfg = Release|x64 + {AF5DEE0A-1307-4B0C-A641-9E617B14E14A}.Release|x64.Build.0 = Release|x64 + {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Debug|x64.ActiveCfg = Debug|x64 + {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Debug|x64.Build.0 = Debug|x64 + {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Release|x64.ActiveCfg = Release|x64 + {25EC5637-EA0E-438C-B0BD-6EC2F7B1CFB6}.Release|x64.Build.0 = Release|x64 + {899080EB-4531-438A-97C0-DDC890DFA5B1}.Debug|x64.ActiveCfg = Debug|x64 + {899080EB-4531-438A-97C0-DDC890DFA5B1}.Debug|x64.Build.0 = Debug|x64 + {899080EB-4531-438A-97C0-DDC890DFA5B1}.Release|x64.ActiveCfg = Release|x64 + {899080EB-4531-438A-97C0-DDC890DFA5B1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NumericCompareDisplayPlugin/NumericCompareDisplayPlugin.csproj b/NumericCompareDisplayPlugin/NumericCompareDisplayPlugin.csproj index ccb1526..a92dd22 100644 --- a/NumericCompareDisplayPlugin/NumericCompareDisplayPlugin.csproj +++ b/NumericCompareDisplayPlugin/NumericCompareDisplayPlugin.csproj @@ -1,11 +1,11 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 @@ -14,14 +14,14 @@ - + - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" - + + + \ No newline at end of file diff --git a/README.md b/README.md index d889b54..07dab7e 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,15 @@ ATLAS Display API is available as a Nuget package to registered users from the * See the [API Documentation](https://mat-docs.github.io/) -## Atlas.DisplayAPI targetting .NET6 only from version 11.2.3.460 onwards -Version 11.2.3.460 of Atlas.DisplayAPI will be the first release that only targets .NET6; we will no longer support .NET Framework integrations from this point onwards. If you still require .NET Framework compatiable builds then please use an older version from the Repository. +## .NET 8 support from version 11.4.4.349-W47 +Version 11.4.4.349-W47 of `Atlas.DisplayAPI` will be the first release to officially support .NET 8. While pplugins built for .NET 6 are expected to remain compatible with Atlas, we recommend upgrading to .NET 8 to benefit from performance improvements, support, and enhanced features. + +## .NET 6 support from version 11.2.3.460 +Version 11.2.3.460 of `Atlas.DisplayAPI` will be the first release that only targets .NET 6; we will no longer support .NET Framework integrations from this point onwards. If you still require .NET Framework compatiable builds then please use an older version from the Repository. ## Notes on upgrading Atlas.DisplayAPI package from versions prior to 11.1.2.344 -Version 11.1.2.344 of Atlas.DisplayAPI upgrades System.Reactive from 3.1.1 to 4.4.1. If you are developing your solution in Visual Studio then be advised that the Nuget upgrade process does not automatically remove any previously dependent packages that are no longer required. +Version 11.1.2.344 of `Atlas.DisplayAPI` upgrades `System.Reactive` from `3.1.1` to `4.4.1`. If you are developing your solution in Visual Studio then be advised that the Nuget upgrade process does not automatically remove any previously dependent packages that are no longer required. In order to reduce the likelihood of runtime errors we strongly recommend you manually remove the following redundant package following the upgrade: -1. System.Reactive.Interfaces 3.1.1 \ No newline at end of file +1. `System.Reactive.Interfaces` `3.1.1` \ No newline at end of file diff --git a/SampleDisplayPlugin/SampleDisplayPlugin.csproj b/SampleDisplayPlugin/SampleDisplayPlugin.csproj index ee20d96..48d2c3e 100644 --- a/SampleDisplayPlugin/SampleDisplayPlugin.csproj +++ b/SampleDisplayPlugin/SampleDisplayPlugin.csproj @@ -1,14 +1,14 @@  - net6.0-windows + net8.0-windows Library false true true - true + x64 - + @@ -17,10 +17,10 @@ - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" - + + + \ No newline at end of file diff --git a/SimpleGaugePlugin/SimpleGaugePlugin.csproj b/SimpleGaugePlugin/SimpleGaugePlugin.csproj index 12313fa..bb18c32 100644 --- a/SimpleGaugePlugin/SimpleGaugePlugin.csproj +++ b/SimpleGaugePlugin/SimpleGaugePlugin.csproj @@ -1,11 +1,12 @@  - net6.0-windows + net8.0-windows Library false true true - true + true + x64 @@ -14,16 +15,15 @@ - + - + - - call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)$(ProjectName).dll" -call "$(SolutionDir)scripts\deploy.bat" "$(TargetDir)CircularGauge.dll" - + + + \ No newline at end of file