Update csproj

2026-03-26 18:49:46 +08:00 · 2021-03-28 16:26:11 +08:00
parent 5d74321771
commit c669097aa5
7 changed files with 34 additions and 40 deletions
--- a/BUILD.ps1
+++ b/BUILD.ps1
@@ -1,7 +1,8 @@
 Write-Host 'Building'

-dotnet build -p:Configuration="Release" `
-	-restore `
+dotnet build `
+	-c "Release" `
+	-p:Platform="x64" `
 	Netch\Netch.csproj

 if ($LASTEXITCODE) { exit $LASTEXITCODE } 
--- a/Interop.nfapinet/Interop.nfapinet.csproj
+++ b/Interop.nfapinet/Interop.nfapinet.csproj
@@ -1,13 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net5.0-windows7</TargetFramework>
+        <TargetFramework>net5.0-windows7.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>x64</Platforms>
    </PropertyGroup>

-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <DebugType>none</DebugType>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <DebugType>none</DebugType>
+        <DebugSymbols>false</DebugSymbols>
    </PropertyGroup>

 </Project>
--- a/Netch.sln
+++ b/Netch.sln
@@ -22,10 +22,10 @@ Global
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.ActiveCfg = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.Build.0 = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Release|x64.ActiveCfg = Release|x64
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.Build.0 = Release|Any CPU
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.ActiveCfg = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.Build.0 = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.ActiveCfg = Release|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Netch/Netch.csproj
+++ b/Netch/Netch.csproj
@@ -2,37 +2,35 @@

    <PropertyGroup>
        <OutputType>WinExe</OutputType>
-        <TargetFramework>net5.0-windows7</TargetFramework>
        <UseWindowsForms>true</UseWindowsForms>
        <UseWPF>true</UseWPF>
        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
        <StartupObject>Netch.Netch</StartupObject>
        <ApplicationManifest>App.manifest</ApplicationManifest>
        <ApplicationIcon>Resources\Netch.ico</ApplicationIcon>
-        <Platforms>x64</Platforms>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-        <LangVersion>latest</LangVersion>
        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <AnalysisMode>Default</AnalysisMode>
        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
    </PropertyGroup>

+    <PropertyGroup>
+        <TargetFramework>net5.0-windows</TargetFramework>
+        <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>x64</Platforms>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    </PropertyGroup>
+
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
        <OutputPath>bin\x64\Debug\</OutputPath>
        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-        <NoWarn />
    </PropertyGroup>

    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <NoWarn />
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
        <OutputPath>bin\x64\Release\</OutputPath>
        <DebugType>none</DebugType>
        <DebugSymbols>false</DebugSymbols>
@@ -60,13 +58,6 @@
        <ProjectReference Include="..\Interop.nfapinet\Interop.nfapinet.csproj" />
    </ItemGroup>

-    <PropertyGroup>
-        <PublishSingleFile>true</PublishSingleFile>
-        <SelfContained>false</SelfContained>
-        <PublishTrimmed>false</PublishTrimmed>
-        <PublishReadyToRun>false</PublishReadyToRun>
-    </PropertyGroup>
-
    <ItemGroup>
        <None Remove=".gitignore" />
        <None Visible="false" Include="..\binaries\**" LinkBase="bin" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
@@ -106,12 +97,6 @@
        </None>
    </ItemGroup>

-    <ProjectExtensions>
-        <VisualStudio>
-            <UserProperties />
-        </VisualStudio>
-    </ProjectExtensions>
-
    <Target Condition="'$(PublishSingleFile)' == 'true'" AfterTargets="_ComputeFilesToBundle" Name="RemoveDupeAssemblies">
        <ItemGroup>
            <_FilesToBundle Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\lib\netstandard1.6\Dia2Lib.dll" />
--- a/Netch/Updater/Updater.cs
+++ b/Netch/Updater/Updater.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Windows.Threading;
 using Netch.Controllers;
 using Netch.Models;
 using Netch.Properties;
@@ -97,7 +96,6 @@ namespace Netch.Updater

        private void ApplyUpdate()
        {
-            var dispatcher = Dispatcher.CurrentDispatcher;
            var mainForm = Global.MainForm;

            #region PreUpdate
@@ -132,7 +130,7 @@ namespace Netch.Updater
            MoveAllFilesOver(Path.Combine(extractPath, "Netch"), _installDirectory);

            // release mutex, exit
-            dispatcher.Invoke(Netch.SingleInstance.Dispose);
+            mainForm.Invoke(new Action(Netch.SingleInstance.Dispose));
            Process.Start(Global.NetchExecutable);
            Environment.Exit(0);
        }
--- a/PUBLISH.ps1
+++ b/PUBLISH.ps1
@@ -1,6 +1,13 @@
 Write-Host 'Building'

-dotnet publish -c "Release" `
+dotnet publish `
+	-c "Release" `
+	-r "win-x64" `
+	-p:Platform="x64" `
+	-p:PublishSingleFile=true `
+	-p:SelfContained=false `
+	-p:PublishTrimmed=false `
+	-p:PublishReadyToRun=false `
 	-o Netch\bin\Publish\ `
 	Netch\Netch.csproj

--- a/UnitTest/UnitTest.csproj
+++ b/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net5.0-windows7</TargetFramework>
+        <TargetFramework>net5.0-windows</TargetFramework>
        <Platforms>x64</Platforms>
        <UseWindowsForms>true</UseWindowsForms>
        <LangVersion>latest</LangVersion>