diff --git a/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj b/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj index 180bb91e..5ab63519 100644 --- a/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj +++ b/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj @@ -6,19 +6,13 @@ win-x64 true - False + True True False - full - true + Full + True - - - - - - @@ -42,6 +36,7 @@ + diff --git a/OneDotNet.sln b/OneDotNet.sln index d5692bad..0814b2a3 100644 --- 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 deleted file mode 100644 index ceee86a4..00000000 --- a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************************* - - Toolkit for WPF - - Copyright (C) 2007-2018 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -internal static class _XceedVersionInfo -{ - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - public const string BaseVersion = "3.7"; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - public const string Version = BaseVersion + - ".0.0"; - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - public const string PublicKeyToken = "ba83ff368b7563c6"; - - -} diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs deleted file mode 100644 index 9fc4c1a2..00000000 --- a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs +++ /dev/null @@ -1,22 +0,0 @@ -/************************************************************************************* - - Toolkit for WPF - - Copyright (C) 2007-2018 Xceed Software Inc. - - This program is provided to you under the terms of the Microsoft Public - License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license - - For more features, controls, and fast professional support, - pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ - - Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids - - ***********************************************************************************/ - -internal static class _XceedVersionInfoCommon -{ - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - public const string Build = ".*"; - -} diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs index e0dbeec3..d6d9a0f3 100644 --- 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/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Properties/AssemblyDescription.cs similarity index 90% rename from third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs rename to third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Properties/AssemblyDescription.cs index 9d85dbfb..d21156a5 100644 --- a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs +++ b/third_party/ExtendedWPFToolkit/Xceed.Wpf.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 index 24464861..52b60814 100644 --- 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 @@ $(NetfxLegacyTargetFramework);$(NetcoreCurrentTargetFramework) true - Library - false - Full + Library + + Full + True diff --git a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj.old b/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj.old deleted file mode 100644 index 6e231592..00000000 --- a/third_party/ExtendedWPFToolkit/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj.old +++ /dev/null @@ -1,954 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {72E591D6-8F83-4D8C-8F67-9C325E623234} - Library - Properties - Xceed.Wpf.Toolkit - Xceed.Wpf.Toolkit - v4.0 - Client - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - 4.0 - - - - - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CollectionControlDialog.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - Code - - - - Code - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ErrorMessages.cs - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file