Switch to dotnet build

Fix some publish and resource issues
menees · Jun 1, 2024 · 432aa56 · 432aa56
1 parent d6eadf6
commit 432aa56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -25,9 +25,7 @@ if ($build)
 {
 	foreach ($configuration in $configurations)
 	{
-		# Restore NuGet packages first
-		msbuild $slnPath /p:Configuration=$configuration /t:Restore /v:$msBuildVerbosity /nologo
-		msbuild $slnPath /p:Configuration=$configuration /v:$msBuildVerbosity /nologo
+		dotnet build $slnPath /p:Configuration=$configuration /v:$msBuildVerbosity /nologo
 	}
 }
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,7 @@
 		<RepositoryUrl>https://github.com/menees/WirePeep</RepositoryUrl>
 		<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
 		<SignAssembly>true</SignAssembly>
-		<LangVersion>latest</LangVersion>
+		<LangVersion>12</LangVersion>
 		<Copyright>Copyright © 2020-$([System.DateTime]::UtcNow.ToString(`yyyy`)) Bill Menees</Copyright>
 
 		<!-- When TargetFrameworks changes, also update the app's Properties\PublishProfiles\*.pubxml files. -->
@@ -18,11 +18,13 @@
 		<RepoSrcFolder>$(MSBuildThisFileDirectory)</RepoSrcFolder>
 		<CodeAnalysisRuleSet>$(RepoSrcFolder)WirePeep.ruleset</CodeAnalysisRuleSet>
 		<AssemblyOriginatorKeyFile>$(RepoSrcFolder)WirePeep.snk</AssemblyOriginatorKeyFile>
+		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 		<UseCustomCodeAnalyzers>true</UseCustomCodeAnalyzers>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<_SkipUpgradeNetAnalyzersNuGetWarning >true</_SkipUpgradeNetAnalyzersNuGetWarning>
+		<IsPublishable>false</IsPublishable>
 
 		<!-- Make the assembly, file, and NuGet package versions the same. -->
 		<Version>1.1.5</Version>
@@ -49,6 +51,10 @@
 		<AssemblyMetadata Include="ProductUrl" Value="$(PackageProjectUrl)" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="System.Resources.Extensions" Version="6.0.0"/>
+	</ItemGroup>
+
 	<ItemGroup Condition="$(UseCustomCodeAnalyzers)">
 		<PackageReference Include="codecracker.CSharp" Version="1.1.0">
 			<PrivateAssets>all</PrivateAssets>

diff --git a/src/WirePeep/WirePeep.csproj b/src/WirePeep/WirePeep.csproj
@@ -6,6 +6,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 		<Description>Free, open-source network downtime monitor</Description>
 		<ApplicationIcon>Images\WirePeep.ico</ApplicationIcon>
+		<IsPublishable>true</IsPublishable>
 	</PropertyGroup>
 
 	<ItemGroup>