Fix Xceed.Wpf.Toolkit

hcoona · Dec 17, 2019 · 8b0f006 · 8b0f006
1 parent 8cf0c5f
commit 8b0f006
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1,030 deletions.
diff --git a/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj b/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj
@@ -6,19 +6,13 @@
 
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
+    <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
     <PublishTrimmed>False</PublishTrimmed>
 
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="3.7.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="MiqM.Xceed.Wpf.Toolkit.NETCore" Version="3.4.0.1" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Condition="'$(Configuration)' != 'Release'" Include="Grpc.Core.Testing" Version="2.25.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0" />
@@ -42,6 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\GrpcLoggerAdapater\GrpcLoggerAdapater\GrpcLoggerAdapater.csproj" />
+    <ProjectReference Include="..\..\third_party\ExtendedWPFToolkit\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.Grpc\GeothermalResearchInstitute.Grpc.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.PlcV2\GeothermalResearchInstitute.PlcV2.csproj" />
   </ItemGroup>

diff --git a/OneDotNet.sln b/OneDotNet.sln
@@ -120,6 +120,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{9578F6A5-5
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerilogLab", "codelab\SerilogLab\SerilogLab.csproj", "{B0AF0ADB-08FE-4312-BDDE-3C3562FB7E37}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit", "third_party\ExtendedWPFToolkit\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{6F79C3CF-633E-4645-A3B1-D9D6520526CD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -321,6 +323,12 @@ Global
 		{B0AF0ADB-08FE-4312-BDDE-3C3562FB7E37}.DebugNonWindows|Any CPU.Build.0 = Debug|Any CPU
 		{B0AF0ADB-08FE-4312-BDDE-3C3562FB7E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0AF0ADB-08FE-4312-BDDE-3C3562FB7E37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.DebugNonWindows|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.DebugNonWindows|Any CPU.Build.0 = Debug|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -363,6 +371,7 @@ Global
 		{D724B7E1-7DCF-4BF2-AAF6-B4CDB743DB99} = {BB7EFF62-B03A-4996-9798-17DB422DD96F}
 		{9578F6A5-5C44-46F3-9965-DEF4D39FC5D5} = {BB7EFF62-B03A-4996-9798-17DB422DD96F}
 		{B0AF0ADB-08FE-4312-BDDE-3C3562FB7E37} = {9D7C39A1-EF36-4491-8CC0-2D45C3B51580}
+		{6F79C3CF-633E-4645-A3B1-D9D6520526CD} = {E307CA64-13F5-446A-BCA5-C611A235A2E4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E0F2E2F1-944D-46B4-BA89-EE1F0BBD57A1}

diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
@@ -1,4 +1,4 @@
-/*************************************************************************************
+/*************************************************************************************
    
    Toolkit for WPF
 
@@ -87,7 +87,12 @@ void ISupportInitialize.EndInit()
                     throw new InvalidOperationException("AssemblyName and SourcePath must be set during initialization");
 
                 //Using an absolute path is necessary in VS2015 for themes different than Windows 8.
-                string uriStr = string.Format(@"pack://application:,,,/{0};v{1};component/{2}", this.AssemblyName, _XceedVersionInfo.Version, this.SourcePath);
+#if NETCORE
+                const string assemblyVersion = ThisAssembly.AssemblyVersion;
+#else
+                const string assemblyVersion = "1.0.0.0";
+#endif
+                string uriStr = string.Format(@"pack://application:,,,/{0};v{1};component/{2}", this.AssemblyName, assemblyVersion, this.SourcePath);
                 this.Source = new Uri(uriStr, UriKind.Absolute);
             }
 

diff --git a/...ed.Wpf.Toolkit/Properties/AssemblyInfo.cs → ...Toolkit/Properties/AssemblyDescription.cs b/...ed.Wpf.Toolkit/Properties/AssemblyInfo.cs → ...Toolkit/Properties/AssemblyDescription.cs
@@ -28,18 +28,6 @@ This program is provided to you under the terms of the Microsoft Public
 
 #endregion
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xceed Toolkit for WPF")]
-[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2018")]
-[assembly: AssemblyCulture("")]
-
-
 // Needed to enable xbap scenarios
 [assembly: AllowPartiallyTrustedCallers]
 

diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -2,9 +2,10 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetfxLegacyTargetFramework);$(NetcoreCurrentTargetFramework)</TargetFrameworks>
     <UseWpf>true</UseWpf>
-    <OutputType>Library</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <DebugType>Full</DebugType>
+    <OutputType>Library</OutputType>
+
+    <DebugType>Full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />