Fix build on linux

abc-software · Apr 3, 2024 · 1f998b0 · 1f998b0
1 parent 5eb7415
commit 1f998b0
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 250 deletions.
diff --git a/Abc.Xacml.sln b/Abc.Xacml.sln
@@ -13,13 +13,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Xacml", "src\Abc.Xacml\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D98CD26-47FB-47ED-A1B2-BD550F4566E3}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B0D9E1D4-E9B6-45D9-88C5-5DF01A564AD8}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D36EEA8F-B188-4564-92C7-7643B8B2DE28}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{CCE5F0D6-1E7F-4347-AE15-4A8993D56E1C}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/src/Abc.Xacml.Geo/Abc.Xacml.Geo.csproj b/src/Abc.Xacml.Geo/Abc.Xacml.Geo.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>Properties\abc.snk</AssemblyOriginatorKeyFile>
-    <Authors>ABC software</Authors>
-    <Company>ABC software</Company>
-    <Product></Product>
-    <Version>1.2.1</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.1</FileVersion>
-    <Copyright>Copyright © ABC software 2011-2018</Copyright>
     <CodeAnalysisRuleSet>Abc.Xacml.Geo.ruleset</CodeAnalysisRuleSet>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
@@ -21,33 +20,12 @@ Supported platforms:
 - .NET Framework 4.6.2+
 - .NET Standard 2.0
 - .NET 6.0</Description>
-    <PackageProjectUrl>https://github.com/abc-software/abc.xacml</PackageProjectUrl>
     <PackageTags>XACML GEOXACML OGC</PackageTags>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/abc-software/abc.xacml</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="stylecop.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.7.0.7192">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="GeoAPI" Version="1.7.5" />
-    <PackageReference Include="NetTopologySuite" Version="1.15.1" />
+    <PackageReference Include="NetTopologySuite" Version="1.15.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">

diff --git a/src/Abc.Xacml.Geo/Properties/AssemblyInfo.cs b/src/Abc.Xacml.Geo/Properties/AssemblyInfo.cs
diff --git a/src/Abc.Xacml/Abc.Xacml.csproj b/src/Abc.Xacml/Abc.Xacml.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Properties\abc.snk</AssemblyOriginatorKeyFile>
-    <Authors>ABC software</Authors>
-    <Company>ABC software</Company>
-    <Product></Product>
-    <Version>1.2.2</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.2</FileVersion>
-    <Copyright>Copyright © ABC software 2011-2024</Copyright>
     <CodeAnalysisRuleSet>Abc.Xacml.ruleset</CodeAnalysisRuleSet>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
@@ -20,34 +19,10 @@ Supported platforms:
 - .NET Framework 4.6.2+
 - .NET Standard 2.0
 - .NET 6.0</Description>
-    <PackageProjectUrl>https://github.com/abc-software/abc.xacml</PackageProjectUrl>
     <PackageTags>XACML OASIS</PackageTags>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/abc-software/abc.xacml</RepositoryUrl>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="stylecop.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--<PackageReference Include="SonarAnalyzer.CSharp" Version="7.7.0.7192">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>-->
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Composition" Version="1.2.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
@@ -60,7 +35,7 @@ Supported platforms:
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0'  ">
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Composition" Version="1.2.0" />
+    <PackageReference Include="System.Composition" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/Abc.Xacml/Properties/AssemblyInfo.cs b/src/Abc.Xacml/Properties/AssemblyInfo.cs
diff --git a/src/Abc.Xacml/stylecop.json b/src/Abc.Xacml/stylecop.json
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <Authors>ABC software</Authors>
+    <Company>ABC software</Company>
+    <Product></Product>
+    <Version>1.2.2</Version>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <Copyright>Copyright © ABC software 2011-2024</Copyright>
+    <PackageProjectUrl>https://github.com/abc-software/abc.xacml</PackageProjectUrl>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>git://github.com/abc-software/abc.xacml</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="stylecop.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.1.88495">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <!--<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> -->
+  </ItemGroup>
+
+
+</Project>
diff --git a/src/Abc.Xacml.Geo/stylecop.json → src/stylecop.json b/src/Abc.Xacml.Geo/stylecop.json → src/stylecop.json
diff --git a/test/Abc.Xacml.Geo.UnitTests/Abc.Xacml.Geo.UnitTests.csproj b/test/Abc.Xacml.Geo.UnitTests/Abc.Xacml.Geo.UnitTests.csproj
@@ -1,26 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>net462;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>Properties\abc.snk</AssemblyOriginatorKeyFile>
-    <Authors>ABC software</Authors>
-    <Company>ABC software</Company>
-    <Product></Product>
-    <Version>1.2.2</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.2</FileVersion>
-    <Copyright>Copyright © ABC software 2011-2023</Copyright>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Abc.Xacml.Geo\Abc.Xacml.Geo.csproj" />
   </ItemGroup>