Remove third_party/OxyPlot

hcoona · Aug 16, 2022 · 8b24654 · 8b24654
1 parent e5b9650
commit 8b24654
Show file tree

Hide file tree

Showing 376 changed files with 45 additions and 69,606 deletions.
diff --git a/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj b/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj
@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="OxyPlot.Wpf" />
     <PackageReference Include="Prism.Unity" />
     <PackageReference Include="Prism.Validation" />
     <PackageReference Include="Serilog" />
@@ -38,7 +39,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\GrpcLoggerAdapater\GrpcLoggerAdapater\GrpcLoggerAdapater.csproj" />
     <ProjectReference Include="..\..\third_party\ExtendedWPFToolkit\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
-    <ProjectReference Include="..\..\third_party\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.Grpc\GeothermalResearchInstitute.Grpc.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.PlcV2\GeothermalResearchInstitute.PlcV2.csproj" />
   </ItemGroup>

diff --git a/Packages.props b/Packages.props
@@ -63,6 +63,10 @@
     <PackageReference Update="HtmlAgilityPack" Version="1.11.17" />
     <PackageReference Update="Itc4net" Version="1.2.1" />
     <PackageReference Update="Overby.Extensions.AsyncBinaryReaderWriter" Version="1.0.39" />
+    <PackageReference Update="OxyPlot.Contrib.Wpf" Version="2.1.0" />
+    <PackageReference Update="OxyPlot.Core" Version="2.1.0" />
+    <PackageReference Update="OxyPlot.Wpf" Version="2.1.0" />
+    <PackageReference Update="OxyPlot.Wpf.Shared" Version="2.1.0" />
     <PackageReference Update="Prism.Unity" Version="7.2.0.1422" />
     <PackageReference Update="Prism.Validation" Version="1.3.0" />
     <PackageReference Update="Serilog" Version="2.9.0" />

diff --git a/codelab/OxyPlot.SimpleDemo/OxyPlot.SimpleDemo.csproj b/codelab/OxyPlot.SimpleDemo/OxyPlot.SimpleDemo.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\third_party\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
-    <ProjectReference Include="..\..\third_party\OxyPlot\OxyPlot\OxyPlot.csproj" />
+    <PackageReference Include="OxyPlot.Wpf" />
   </ItemGroup>
 
 </Project>
diff --git a/codelab/Wpf_lab/HistoryDataWindow.xaml b/codelab/Wpf_lab/HistoryDataWindow.xaml
@@ -4,7 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Wpf_lab"
-        xmlns:oxy="http://oxyplot.org/wpf"
+        xmlns:oxy="clr-namespace:OxyPlot.Wpf;assembly=OxyPlot.Wpf"
+        xmlns:oxycontrols="http://oxyplot.org/wpf/contrib"
         mc:Ignorable="d"
         Title="常规历史数据"
         WindowStartupLocation="CenterOwner"
@@ -35,14 +36,14 @@
                 </UniformGrid>
             </DockPanel>
         </Border>
-        <oxy:Plot x:Name="pltData">
-            <oxy:Plot.Axes>
-                <oxy:DateTimeAxis x:Name="axisData" Position="Bottom" />
-            </oxy:Plot.Axes>
-            <oxy:Plot.Series>
-                <oxy:LineSeries Title="出水温度"
+        <oxycontrols:Plot x:Name="pltData">
+            <oxycontrols:Plot.Axes>
+                <oxycontrols:DateTimeAxis x:Name="axisData" Position="Bottom" />
+            </oxycontrols:Plot.Axes>
+            <oxycontrols:Plot.Series>
+                <oxycontrols:LineSeries Title="出水温度"
                                 ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Points}"/>
-            </oxy:Plot.Series>
-        </oxy:Plot>
+            </oxycontrols:Plot.Series>
+        </oxycontrols:Plot>
     </DockPanel>
 </Window>
diff --git a/codelab/Wpf_lab/Wpf_lab.csproj b/codelab/Wpf_lab/Wpf_lab.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\third_party\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
-    <ProjectReference Include="..\..\third_party\OxyPlot\OxyPlot\OxyPlot.csproj" />
+    <PackageReference Include="OxyPlot.Contrib.Wpf" />
+    <PackageReference Include="OxyPlot.Wpf" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/codelab/Wpf_lab/packages.lock.json b/codelab/Wpf_lab/packages.lock.json
@@ -26,6 +26,25 @@
         "resolved": "3.5.108",
         "contentHash": "+1Zn/jrrbBS1MVK20W8d8g4nEREPuZ6IHDTmtqlJiNeGXN45Iou0IPe5hykbLAVyWfnoN3bPCDBIVjeAfoMsWQ=="
       },
+      "OxyPlot.Contrib.Wpf": {
+        "type": "Direct",
+        "requested": "[2.1.0, )",
+        "resolved": "2.1.0",
+        "contentHash": "Yid7E9+Td7CgUr6fwNKoH0fXxitdqY+NZToA+ZO3PxPT7yyaUjWxypKezYQNhqNKlVcLC9Toc6GcUZMuiHeXog==",
+        "dependencies": {
+          "OxyPlot.Wpf": "2.1.0"
+        }
+      },
+      "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 +72,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/copy.bara.sky b/copy.bara.sky
@@ -1,61 +1,5 @@
 DESTINATION = folder.destination()
 
-core.workflow(
-    name = "oxyplot",
-    origin = git.github_origin(
-        url = "https://github.com/oxyplot/oxyplot.git",
-        ref = "05b527e154e1d5d8deedef634c0bd19c7e742bdc",
-    ),
-    destination = DESTINATION,
-    origin_files = glob(
-        [
-            "LICENSE",
-            "README.md",
-            "Source/OxyPlot/**",
-            "Source/OxyPlot.Wpf/**",
-        ],
-        exclude = [
-            "**/*.*proj",
-            "**/*.*nuspec",
-            "**/*.DotSettings",
-            "Source/OxyPlot.Wpf/Properties/Resources.*",
-            "Source/OxyPlot.Wpf/Properties/Settings.*",
-        ],
-    ),
-    destination_files = glob(
-        [
-            "third_party/OxyPlot/**",
-        ],
-        exclude = [
-            "third_party/OxyPlot/**/*.*proj",
-            "third_party/OxyPlot/*.props",
-        ],
-    ),
-    authoring = authoring.pass_thru("Shuai Zhang <zhangshuai.ustc@gmail.com>"),
-    transformations = [
-        core.replace(
-            before = "[assembly: AssemblyTitle(\"${words}\")]",
-            after = "",
-            regex_groups = {
-                "words": "[A-Za-z0-9 ]+",
-            },
-            paths = glob(["**/AssemblyDescription.cs"]),
-        ),
-        core.replace(
-            before = "[assembly: AssemblyDescription(\"${words}\")]",
-            after = "",
-            regex_groups = {
-                "words": "[A-Za-z0-9 ]+",
-            },
-            paths = glob(["**/AssemblyDescription.cs"]),
-        ),
-        core.move("LICENSE", "third_party/OxyPlot/LICENSE"),
-        core.move("README.md", "third_party/OxyPlot/README.md"),
-        core.move("Source/OxyPlot", "third_party/OxyPlot/OxyPlot"),
-        core.move("Source/OxyPlot.Wpf", "third_party/OxyPlot/OxyPlot.Wpf"),
-    ],
-)
-
 core.workflow(
     name = "com_github_ejensen_toggle_switch_control",
     origin = git.github_origin(

diff --git a/third_party/OxyPlot/Directory.Build.props b/third_party/OxyPlot/Directory.Build.props
diff --git a/third_party/OxyPlot/LICENSE b/third_party/OxyPlot/LICENSE
diff --git a/third_party/OxyPlot/OxyPlot.Wpf/Annotations/Annotation.cs b/third_party/OxyPlot/OxyPlot.Wpf/Annotations/Annotation.cs