From f53539bc1bef94ab3b51c395a07073b06f0f10e7 Mon Sep 17 00:00:00 2001
From: Martijn van Dijk <mhvdijk@gmail.com>
Date: Mon, 28 Aug 2023 12:33:16 +0200
Subject: [PATCH] Updates

---
 DSTV.Net.Test/DSTV.Net.Test.csproj |  7 +++---
 DSTV.Net/DSTV.Net.csproj           |  1 -
 Directory.Build.props              | 40 +++++++++++++++++++-----------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/DSTV.Net.Test/DSTV.Net.Test.csproj b/DSTV.Net.Test/DSTV.Net.Test.csproj
index a8d3858..4758fd8 100644
--- a/DSTV.Net.Test/DSTV.Net.Test.csproj
+++ b/DSTV.Net.Test/DSTV.Net.Test.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Title>Testclass for DSTV.Net</Title>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/DSTV.Net/DSTV.Net.csproj b/DSTV.Net/DSTV.Net.csproj
index 30294c9..f0b1eb1 100644
--- a/DSTV.Net/DSTV.Net.csproj
+++ b/DSTV.Net/DSTV.Net.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <Description>DSTV.Net is an open-source library tailored for .NET platforms, providing a powerful utility for interacting with DSTV (also known as NC1 or Tekla) files. These files serve as a key industry standard in the steel industry, defining geometry and project information for steel plates.</Description>
         <PackageProjectUrl>https://github.com/Baseflow/DSTV.Net</PackageProjectUrl>
     </PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 903b978..cfe72dd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,6 +18,7 @@
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<Version>1.1.1</Version>
 
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>
@@ -36,14 +37,11 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<IncludeSymbols>true</IncludeSymbols>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-
 		<DesignTimeBuild>false</DesignTimeBuild>
-		<DebugType>portable</DebugType>
-		<DebugSymbols>true</DebugSymbols>
 
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
@@ -54,35 +52,49 @@
 		<PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-	</PropertyGroup>
-
 	<ItemGroup Condition=" '$(IsTestProject)' != 'true'">
 		<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
 		<None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
 		<None Include="$(MSBuildThisFileDirectory)\readme.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-    <ItemGroup>
-		<PackageReference Include="Roslynator.Analyzers" Version="4.3.0">
+	<ItemGroup>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="Meziantou.Polyfill" Version="1.0.26">
 			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="AsyncFixer" Version="1.6.0">
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
+		<PackageReference Include="Roslynator.Analyzers" Version="4.5.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.5.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="ReflectionAnalyzers" Version="0.3.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Meziantou.Analyzer" Version="2.0.62">
+		<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
-    </ItemGroup>
+		<PackageReference Include="Meziantou.Analyzer" Version="2.0.82">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="AsyncFixer" Version="1.6.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+        <PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+	</ItemGroup>
 </Project>