BUGFIX: Should build wpf projects only on windows.

hcoona · Aug 16, 2022 · 9c9443e · 9c9443e
1 parent 7347d02
commit 9c9443e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 78 deletions.
diff --git a/codelab/OxyPlot.SimpleDemo/packages.lock.json b/codelab/OxyPlot.SimpleDemo/packages.lock.json
@@ -26,6 +26,16 @@
         "resolved": "3.5.108",
         "contentHash": "+1Zn/jrrbBS1MVK20W8d8g4nEREPuZ6IHDTmtqlJiNeGXN45Iou0IPe5hykbLAVyWfnoN3bPCDBIVjeAfoMsWQ=="
       },
+      "OxyPlot.Wpf": {
+        "type": "Direct",
+        "requested": "[2.1.0, )",
+        "resolved": "2.1.0",
+        "contentHash": "behQPbPDbV5+OerxO1E2iKH7dNaDN4OFSCzWF8Dy296p9CG/RFd4KyOEHDmcckZ7mYp5KQ4BMLD+WtQLjDSQvQ==",
+        "dependencies": {
+          "OxyPlot.Core": "2.1.0",
+          "OxyPlot.Wpf.Shared": "2.1.0"
+        }
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.1.118, )",
@@ -53,12 +63,16 @@
         "contentHash": "8fZYJqeKBW5uuKBact26IeOBogchn5Km85klHqHneRY7Jxp+ERtrw8zJVumNFUVL68pIcf4uKPOY7zfBQ7eY3A=="
       },
       "OxyPlot.Core": {
-        "type": "Project"
+        "type": "Transitive",
+        "resolved": "2.1.0",
+        "contentHash": "jG+Ct3T59fXDG2LE1hyUaXqH7i+h5Nfway1iB0+0NaY2mvDsz8Row/BKjiBWCt5NHp3+q9JSMiD2wpin2hh3kw=="
       },
-      "oxyplot.wpf": {
-        "type": "Project",
+      "OxyPlot.Wpf.Shared": {
+        "type": "Transitive",
+        "resolved": "2.1.0",
+        "contentHash": "ign36iiFEadBUNF7SVgsPn3DCqP1VWjISRVgEChW5M4LNyC9Lz8iOPy1mypQG/imdn0mCQppTjju+0a4k+yTsA==",
         "dependencies": {
-          "OxyPlot.Core": "[1.0.0, )"
+          "OxyPlot.Core": "2.1.0"
         }
       }
     }

diff --git a/codelab/dirs.proj b/codelab/dirs.proj
@@ -2,13 +2,13 @@
   <ItemGroup>
     <ProjectReference Include="CompdbRegrouper\CompdbRegrouper.csproj" />
     <ProjectReference Include="FileManifests\FileManifests.csproj" />
-    <ProjectReference Condition="$([MSBuild]::IsOSUnixLike())" Include="OxyPlot.SimpleDemo\OxyPlot.SimpleDemo.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="OxyPlot.SimpleDemo\OxyPlot.SimpleDemo.csproj" />
     <ProjectReference Include="ParseHeader\ParseHeader.csproj" />
-    <ProjectReference Condition="$([MSBuild]::IsOSUnixLike())" Include="PrismLab\PrismLab.csproj" />
-    <ProjectReference Condition="$([MSBuild]::IsOSUnixLike())" Include="ProtocolLab\ProtocolLab.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="PrismLab\PrismLab.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="ProtocolLab\ProtocolLab.csproj" />
     <ProjectReference Include="SerilogLab\SerilogLab.csproj" />
-    <ProjectReference Include="TcpServerLab\TcpServerLab.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="TcpServerLab\TcpServerLab.csproj" />
     <ProjectReference Include="TplLab\TplLab.csproj" />
-    <ProjectReference Condition="$([MSBuild]::IsOSUnixLike())" Include="Wpf_lab\Wpf_lab.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="Wpf_lab\Wpf_lab.csproj" />
   </ItemGroup>
 </Project>
diff --git a/dirs.proj b/dirs.proj
@@ -2,7 +2,7 @@
   <ItemGroup>
     <ProjectReference Include="Clocks.Net\dirs.proj" />
     <ProjectReference Include="codelab\dirs.proj" />
-    <ProjectReference Condition="$([MSBuild]::IsOSUnixLike())" Include="GeothermalResearchInstitute\dirs.proj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="GeothermalResearchInstitute\dirs.proj" />
     <ProjectReference Include="GrpcLoggerAdapater\GrpcLoggerAdapater\GrpcLoggerAdapater.csproj" />
     <ProjectReference Include="MicrosoftExtensions\Logging\dirs.proj" />
     <ProjectReference Include="SharpCircularList\dirs.proj" />

diff --git a/third_party/CRC32C.NET/Crc32C.NET/packages.lock.json b/third_party/CRC32C.NET/Crc32C.NET/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETFramework,Version=v4.7.2": {
+    "net6.0": {
       "Microsoft.CodeAnalysis.BannedApiAnalyzers": {
         "type": "Direct",
         "requested": "[2.9.8, )",
@@ -52,72 +52,6 @@
         "resolved": "2.9.8",
         "contentHash": "8fZYJqeKBW5uuKBact26IeOBogchn5Km85klHqHneRY7Jxp+ERtrw8zJVumNFUVL68pIcf4uKPOY7zfBQ7eY3A=="
       }
-    },
-    ".NETStandard,Version=v2.0": {
-      "Microsoft.CodeAnalysis.BannedApiAnalyzers": {
-        "type": "Direct",
-        "requested": "[2.9.8, )",
-        "resolved": "2.9.8",
-        "contentHash": "DPJU5cE6/10d9ZqoUqd23vY4ZcbA4j1ebjZ1fLpVjMfzo7SwJFYKeuz8YN7l7gA2rJAfJ90JtgKeRIARW7YPCA=="
-      },
-      "Microsoft.CodeAnalysis.FxCopAnalyzers": {
-        "type": "Direct",
-        "requested": "[2.9.8, )",
-        "resolved": "2.9.8",
-        "contentHash": "FZhO7S+xinFrcRvPyIxPbFgY0Jg3X+KNkawhg7wwoVxnT/ySdoO162dyIMXfQQ6/qCmjNFHmTDXiNlpPNvKNyQ==",
-        "dependencies": {
-          "Microsoft.CodeAnalysis.VersionCheckAnalyzer": "[2.9.8]",
-          "Microsoft.CodeQuality.Analyzers": "[2.9.8]",
-          "Microsoft.NetCore.Analyzers": "[2.9.8]",
-          "Microsoft.NetFramework.Analyzers": "[2.9.8]"
-        }
-      },
-      "Nerdbank.GitVersioning": {
-        "type": "Direct",
-        "requested": "[3.5.108, )",
-        "resolved": "3.5.108",
-        "contentHash": "+1Zn/jrrbBS1MVK20W8d8g4nEREPuZ6IHDTmtqlJiNeGXN45Iou0IPe5hykbLAVyWfnoN3bPCDBIVjeAfoMsWQ=="
-      },
-      "NETStandard.Library": {
-        "type": "Direct",
-        "requested": "[2.0.3, )",
-        "resolved": "2.0.3",
-        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
-      },
-      "StyleCop.Analyzers": {
-        "type": "Direct",
-        "requested": "[1.1.118, )",
-        "resolved": "1.1.118",
-        "contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
-      },
-      "Microsoft.CodeAnalysis.VersionCheckAnalyzer": {
-        "type": "Transitive",
-        "resolved": "2.9.8",
-        "contentHash": "iSjqkECKpagJPjzc7sMjD6rQWSznVYqTfUZ96yR0r0jDzA45TymBof350tlOfGDRvn4OrU/KKJav21/oZDttrA=="
-      },
-      "Microsoft.CodeQuality.Analyzers": {
-        "type": "Transitive",
-        "resolved": "2.9.8",
-        "contentHash": "KevAiJKuolGKK84jDHMVGJjBAigH/86xyCVtbOzh5avUYzW7jPErdJW708byKKMiVKTwv027mbKCNnnOgNQHsA=="
-      },
-      "Microsoft.NetCore.Analyzers": {
-        "type": "Transitive",
-        "resolved": "2.9.8",
-        "contentHash": "zbGttCZ8T5wJiBDhgIaFWTrYa/X7zbCnQ76PEu/B4gb64KY+yB9gjkndsKWR+2TbOId76PN7WrSQAn+W7gr5jQ=="
-      },
-      "Microsoft.NETCore.Platforms": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
-      },
-      "Microsoft.NetFramework.Analyzers": {
-        "type": "Transitive",
-        "resolved": "2.9.8",
-        "contentHash": "8fZYJqeKBW5uuKBact26IeOBogchn5Km85klHqHneRY7Jxp+ERtrw8zJVumNFUVL68pIcf4uKPOY7zfBQ7eY3A=="
-      }
     }
   }
 }
diff --git a/third_party/dirs.proj b/third_party/dirs.proj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="CRC32C.NET\Crc32C.NET\Crc32C.NET.csproj" />
+    <ProjectReference Condition="!$([MSBuild]::IsOSUnixLike())" Include="CRC32C.NET\Crc32C.NET\Crc32C.NET.csproj" />
   </ItemGroup>
 </Project>