diff options
| author | a1xd <[email protected]> | 2021-09-09 17:28:10 -0400 |
|---|---|---|
| committer | a1xd <[email protected]> | 2021-09-09 17:28:10 -0400 |
| commit | 1964548acbc56edb346d2e396eb0108010d869e1 (patch) | |
| tree | 1f709352d4ff564df385afd3cb8a341d52134644 /writer | |
| parent | rename driver_settings (diff) | |
| download | rawaccel-1964548acbc56edb346d2e396eb0108010d869e1.tar.xz rawaccel-1964548acbc56edb346d2e396eb0108010d869e1.zip | |
port to .NET 5
dependency changes
- Newtonsoft.JSON
+ System.Windows.Forms.DataVisualization
+ System.Data.SqlClient (indirect, but was not added automatically by NuGet)
added ARM64 target
Diffstat (limited to 'writer')
| -rw-r--r-- | writer/App.config | 6 | ||||
| -rw-r--r-- | writer/Program.cs | 9 | ||||
| -rw-r--r-- | writer/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | writer/packages.config | 4 | ||||
| -rw-r--r-- | writer/writer.csproj | 92 |
5 files changed, 28 insertions, 85 deletions
diff --git a/writer/App.config b/writer/App.config deleted file mode 100644 index 56efbc7..0000000 --- a/writer/App.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /> - </startup> -</configuration>
\ No newline at end of file diff --git a/writer/Program.cs b/writer/Program.cs index 83daed1..1a27a11 100644 --- a/writer/Program.cs +++ b/writer/Program.cs @@ -1,9 +1,6 @@ -using Newtonsoft.Json; - -using System; -using System.Collections.Generic; +using System; using System.IO; -using System.Linq; +using System.Text.Json; using System.Windows.Forms; namespace writer @@ -12,7 +9,7 @@ namespace writer class Program { static readonly string DefaultPath = "settings.json"; - static readonly string Usage = + static readonly string Usage = $"Usage: {AppDomain.CurrentDomain.FriendlyName} <settings file path>\n"; static void Exit(string msg) diff --git a/writer/Properties/AssemblyInfo.cs b/writer/Properties/AssemblyInfo.cs index 7f47c6d..3fd84d1 100644 --- a/writer/Properties/AssemblyInfo.cs +++ b/writer/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/writer/packages.config b/writer/packages.config deleted file mode 100644 index a9de8b5..0000000 --- a/writer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" /> -</packages>
\ No newline at end of file diff --git a/writer/writer.csproj b/writer/writer.csproj index 1c4cca5..49768fd 100644 --- a/writer/writer.csproj +++ b/writer/writer.csproj @@ -1,75 +1,31 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{28ACF254-E4EF-4A0E-9761-0FE22048D6FD}</ProjectGuid> <OutputType>WinExe</OutputType> - <RootNamespace>writer</RootNamespace> - <AssemblyName>writer</AssemblyName> - <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <Deterministic>true</Deterministic> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>x64</PlatformTarget> - <LangVersion>7.3</LangVersion> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <Prefer32Bit>true</Prefer32Bit> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + <TargetFramework>net5.0-windows</TargetFramework> + <UseWindowsForms>true</UseWindowsForms> + <Platforms>ARM64;x64</Platforms> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <Optimize>true</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>x64</PlatformTarget> - <LangVersion>7.3</LangVersion> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <Prefer32Bit>true</Prefer32Bit> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <ProduceReferenceAssembly>false</ProduceReferenceAssembly> </PropertyGroup> - <PropertyGroup> - <StartupObject /> - </PropertyGroup> - <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Windows.Forms" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> - </ItemGroup> + +<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <PlatformTarget>ARM64</PlatformTarget> +</PropertyGroup> +<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> + <PlatformTarget>ARM64</PlatformTarget> +</PropertyGroup> + +<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <PlatformTarget>x64</PlatformTarget> +</PropertyGroup> +<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <PlatformTarget>x64</PlatformTarget> +</PropertyGroup> <ItemGroup> - <Compile Include="Program.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <ProjectReference Include="..\wrapper\wrapper.vcxproj" /> </ItemGroup> - <ItemGroup> - <None Include="App.config" /> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\wrapper\wrapper.vcxproj"> - <Project>{28a3656f-a1de-405c-b547-191c32ec555f}</Project> - <Name>wrapper</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent>IF ($(ConfigurationName)) == (Debug) GOTO END -copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" -:END</PostBuildEvent> - </PropertyGroup> </Project>
\ No newline at end of file |