From f4d2067c0554d3266358a1cbc12d47a959a2ab8d Mon Sep 17 00:00:00 2001 From: Jozef Chmelar ml Date: Fri, 7 Aug 2020 15:13:31 +0200 Subject: [PATCH 1/3] Converted old csproj to new version using dotnet migrate-2019 wizard --- GridExtra.Wpf/GridExtra.Wpf.csproj | 118 +++------ GridExtra.Wpf/Properties/AssemblyInfo.cs | 26 -- GridExtra.sln | 236 +++++++++--------- Sample/BasicSample.Wpf/BasicSample.Wpf.csproj | 142 +++-------- .../Properties/AssemblyInfo.cs | 26 -- 5 files changed, 183 insertions(+), 365 deletions(-) diff --git a/GridExtra.Wpf/GridExtra.Wpf.csproj b/GridExtra.Wpf/GridExtra.Wpf.csproj index e8e633c..9428194 100644 --- a/GridExtra.Wpf/GridExtra.Wpf.csproj +++ b/GridExtra.Wpf/GridExtra.Wpf.csproj @@ -1,86 +1,34 @@ - - - - - Debug - AnyCPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6} - library - Properties - SourceChord.GridExtra - GridExtra.Wpf - v4.5 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - ..\Build\Wpf\Debug\ - TRACE;DEBUG;WINDOWS_WPF - prompt - 4 - - - none - true - ..\Build\Wpf\Release\ - TRACE;WINDOWS_WPF - prompt - 4 - - - - - - - - - - - - 4.0 - - - - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - + + + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6} + SourceChord.GridExtra + net45;netcoreapp3.1 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + GridExtra.Wpf + SourceChord + GridExtra.Wpf + Copyright © 2016 + 0.4.0.0 + 0.4.0.0 + ..\Build\Wpf\$(Configuration)\ + true + + + full + TRACE;DEBUG;WINDOWS_WPF + + + none + TRACE;WINDOWS_WPF + + + + + + + + + + + \ No newline at end of file diff --git a/GridExtra.Wpf/Properties/AssemblyInfo.cs b/GridExtra.Wpf/Properties/AssemblyInfo.cs index d937180..c774a9a 100644 --- a/GridExtra.Wpf/Properties/AssemblyInfo.cs +++ b/GridExtra.Wpf/Properties/AssemblyInfo.cs @@ -4,18 +4,6 @@ using System.Runtime.InteropServices; using System.Windows; -// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 -// アセンブリに関連付けられている情報を変更するには、 -// これらの属性値を変更してください。 -[assembly: AssemblyTitle("GridExtra.Wpf")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("SourceChord")] -[assembly: AssemblyProduct("GridExtra.Wpf")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから // 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、 // その型の ComVisible 属性を true に設定してください。 @@ -39,17 +27,3 @@ //(リソースがページ、 //アプリケーション、またはいずれのテーマ固有のリソース ディクショナリにも見つからない場合に使用されます) )] - - -// アセンブリのバージョン情報は次の 4 つの値で構成されています: -// -// メジャー バージョン -// マイナー バージョン -// ビルド番号 -// Revision -// -// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を -// 既定値にすることができます: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0.0")] -[assembly: AssemblyFileVersion("0.4.0.0")] diff --git a/GridExtra.sln b/GridExtra.sln index 8c4c65e..4801b4b 100644 --- a/GridExtra.sln +++ b/GridExtra.sln @@ -1,117 +1,119 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridExtra.Wpf", "GridExtra.Wpf\GridExtra.Wpf.csproj", "{631C583B-5E88-4ABD-9926-C18E4ADDF6C6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridExtra.Uwp", "GridExtra.Uwp\GridExtra.Uwp.csproj", "{FE7A5887-17BC-48E9-B601-815A2FDBF2A0}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GridExtra.Shared", "GridExtra.Shared\GridExtra.Shared.shproj", "{4914D867-F667-4151-A039-3FDE665F3106}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{611249A1-CDE6-4AAD-B532-73007C552C77}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSample.Wpf", "Sample\BasicSample.Wpf\BasicSample.Wpf.csproj", "{E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSample.Uwp", "Sample\BasicSample.Uwp\BasicSample.Uwp.csproj", "{416D9AA6-F3E7-4338-B9A3-E060060DAF0C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{E1C85495-293B-4198-845C-6D7068A1961E}" - ProjectSection(SolutionItems) = preProject - Nuget\GridExtra.nuspec = Nuget\GridExtra.nuspec - Nuget\pack.bat = Nuget\pack.bat - EndProjectSection -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - GridExtra.Shared\GridExtra.Shared.projitems*{4914d867-f667-4151-a039-3fde665f3106}*SharedItemsImports = 13 - GridExtra.Shared\GridExtra.Shared.projitems*{631c583b-5e88-4abd-9926-c18e4addf6c6}*SharedItemsImports = 4 - GridExtra.Shared\GridExtra.Shared.projitems*{fe7a5887-17bc-48e9-b601-815a2fdbf2a0}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|ARM.Build.0 = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x64.Build.0 = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x86.Build.0 = Debug|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|Any CPU.Build.0 = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|ARM.ActiveCfg = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|ARM.Build.0 = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x64.ActiveCfg = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x64.Build.0 = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x86.ActiveCfg = Release|Any CPU - {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x86.Build.0 = Release|Any CPU - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|ARM.ActiveCfg = Debug|ARM - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|ARM.Build.0 = Debug|ARM - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x64.ActiveCfg = Debug|x64 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x64.Build.0 = Debug|x64 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x86.ActiveCfg = Debug|x86 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x86.Build.0 = Debug|x86 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|Any CPU.Build.0 = Release|Any CPU - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|ARM.ActiveCfg = Release|ARM - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|ARM.Build.0 = Release|ARM - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x64.ActiveCfg = Release|x64 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x64.Build.0 = Release|x64 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x86.ActiveCfg = Release|x86 - {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x86.Build.0 = Release|x86 - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|ARM.Build.0 = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x64.ActiveCfg = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x64.Build.0 = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x86.ActiveCfg = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x86.Build.0 = Debug|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|Any CPU.Build.0 = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|ARM.ActiveCfg = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|ARM.Build.0 = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x64.ActiveCfg = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x64.Build.0 = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x86.ActiveCfg = Release|Any CPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x86.Build.0 = Release|Any CPU - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|Any CPU.ActiveCfg = Debug|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.ActiveCfg = Debug|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.Build.0 = Debug|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.Deploy.0 = Debug|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.ActiveCfg = Debug|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.Build.0 = Debug|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.Deploy.0 = Debug|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.ActiveCfg = Debug|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.Build.0 = Debug|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.Deploy.0 = Debug|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|Any CPU.ActiveCfg = Release|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.ActiveCfg = Release|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.Build.0 = Release|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.Deploy.0 = Release|ARM - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.ActiveCfg = Release|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.Build.0 = Release|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.Deploy.0 = Release|x64 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.ActiveCfg = Release|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.Build.0 = Release|x86 - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.Deploy.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B} = {611249A1-CDE6-4AAD-B532-73007C552C77} - {416D9AA6-F3E7-4338-B9A3-E060060DAF0C} = {611249A1-CDE6-4AAD-B532-73007C552C77} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30320.27 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GridExtra.Wpf", "GridExtra.Wpf\GridExtra.Wpf.csproj", "{631C583B-5E88-4ABD-9926-C18E4ADDF6C6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridExtra.Uwp", "GridExtra.Uwp\GridExtra.Uwp.csproj", "{FE7A5887-17BC-48E9-B601-815A2FDBF2A0}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GridExtra.Shared", "GridExtra.Shared\GridExtra.Shared.shproj", "{4914D867-F667-4151-A039-3FDE665F3106}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{611249A1-CDE6-4AAD-B532-73007C552C77}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicSample.Wpf", "Sample\BasicSample.Wpf\BasicSample.Wpf.csproj", "{E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSample.Uwp", "Sample\BasicSample.Uwp\BasicSample.Uwp.csproj", "{416D9AA6-F3E7-4338-B9A3-E060060DAF0C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{E1C85495-293B-4198-845C-6D7068A1961E}" + ProjectSection(SolutionItems) = preProject + Nuget\GridExtra.nuspec = Nuget\GridExtra.nuspec + Nuget\pack.bat = Nuget\pack.bat + EndProjectSection +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + GridExtra.Shared\GridExtra.Shared.projitems*{4914d867-f667-4151-a039-3fde665f3106}*SharedItemsImports = 13 + GridExtra.Shared\GridExtra.Shared.projitems*{631c583b-5e88-4abd-9926-c18e4addf6c6}*SharedItemsImports = 5 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|ARM.ActiveCfg = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|ARM.Build.0 = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x64.ActiveCfg = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x64.Build.0 = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Debug|x86.Build.0 = Debug|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|Any CPU.Build.0 = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|ARM.ActiveCfg = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|ARM.Build.0 = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x64.ActiveCfg = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x64.Build.0 = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x86.ActiveCfg = Release|Any CPU + {631C583B-5E88-4ABD-9926-C18E4ADDF6C6}.Release|x86.Build.0 = Release|Any CPU + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|ARM.ActiveCfg = Debug|ARM + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|ARM.Build.0 = Debug|ARM + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x64.ActiveCfg = Debug|x64 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x64.Build.0 = Debug|x64 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x86.ActiveCfg = Debug|x86 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Debug|x86.Build.0 = Debug|x86 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|Any CPU.Build.0 = Release|Any CPU + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|ARM.ActiveCfg = Release|ARM + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|ARM.Build.0 = Release|ARM + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x64.ActiveCfg = Release|x64 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x64.Build.0 = Release|x64 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x86.ActiveCfg = Release|x86 + {FE7A5887-17BC-48E9-B601-815A2FDBF2A0}.Release|x86.Build.0 = Release|x86 + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|ARM.Build.0 = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x64.ActiveCfg = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x64.Build.0 = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x86.ActiveCfg = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Debug|x86.Build.0 = Debug|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|Any CPU.Build.0 = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|ARM.ActiveCfg = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|ARM.Build.0 = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x64.ActiveCfg = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x64.Build.0 = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x86.ActiveCfg = Release|Any CPU + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B}.Release|x86.Build.0 = Release|Any CPU + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.ActiveCfg = Debug|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.Build.0 = Debug|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|ARM.Deploy.0 = Debug|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.ActiveCfg = Debug|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.Build.0 = Debug|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x64.Deploy.0 = Debug|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.ActiveCfg = Debug|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.Build.0 = Debug|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Debug|x86.Deploy.0 = Debug|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|Any CPU.ActiveCfg = Release|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.ActiveCfg = Release|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.Build.0 = Release|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|ARM.Deploy.0 = Release|ARM + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.ActiveCfg = Release|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.Build.0 = Release|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x64.Deploy.0 = Release|x64 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.ActiveCfg = Release|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.Build.0 = Release|x86 + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B} = {611249A1-CDE6-4AAD-B532-73007C552C77} + {416D9AA6-F3E7-4338-B9A3-E060060DAF0C} = {611249A1-CDE6-4AAD-B532-73007C552C77} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9C9F2B52-DE04-4D3D-90FA-D68029EA50B2} + EndGlobalSection +EndGlobal diff --git a/Sample/BasicSample.Wpf/BasicSample.Wpf.csproj b/Sample/BasicSample.Wpf/BasicSample.Wpf.csproj index 114f996..e6269fa 100644 --- a/Sample/BasicSample.Wpf/BasicSample.Wpf.csproj +++ b/Sample/BasicSample.Wpf/BasicSample.Wpf.csproj @@ -1,112 +1,32 @@ - - - - - Debug - AnyCPU - {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B} - WinExe - Properties - BasicSample.Wpf - BasicSample.Wpf - v4.5.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - {631c583b-5e88-4abd-9926-c18e4addf6c6} - GridExtra.Wpf - - - - + + + {E180DF3E-1A9F-482E-A7E2-FD7FBB27514B} + WinExe + net452;netcoreapp3.1 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + BasicSample.Wpf + BasicSample.Wpf + Copyright © 2016 + bin\$(Configuration)\ + true + + + full + + + pdbonly + + + + + + + + + + + + + \ No newline at end of file diff --git a/Sample/BasicSample.Wpf/Properties/AssemblyInfo.cs b/Sample/BasicSample.Wpf/Properties/AssemblyInfo.cs index 6e2c9b5..c649d80 100644 --- a/Sample/BasicSample.Wpf/Properties/AssemblyInfo.cs +++ b/Sample/BasicSample.Wpf/Properties/AssemblyInfo.cs @@ -4,18 +4,6 @@ using System.Runtime.InteropServices; using System.Windows; -// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 -// アセンブリに関連付けられている情報を変更するには、 -// これらの属性値を変更してください。 -[assembly: AssemblyTitle("BasicSample.Wpf")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BasicSample.Wpf")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから // 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、 // その型の ComVisible 属性を true に設定してください。 @@ -39,17 +27,3 @@ //(リソースがページ、 //アプリケーション、またはいずれのテーマ固有のリソース ディクショナリにも見つからない場合に使用されます) )] - - -// アセンブリのバージョン情報は次の 4 つの値で構成されています: -// -// メジャー バージョン -// マイナー バージョン -// ビルド番号 -// Revision -// -// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を -// 既定値にすることができます: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] From cbc2454cfdffe46ee5bc64b08b29fcf5e7f54148 Mon Sep 17 00:00:00 2001 From: Jozef Chmelar ml Date: Fri, 7 Aug 2020 15:19:33 +0200 Subject: [PATCH 2/3] Removed useless assemblies for .NET Core app --- GridExtra.Wpf/GridExtra.Wpf.csproj | 9 --------- 1 file changed, 9 deletions(-) diff --git a/GridExtra.Wpf/GridExtra.Wpf.csproj b/GridExtra.Wpf/GridExtra.Wpf.csproj index 9428194..0dc26c7 100644 --- a/GridExtra.Wpf/GridExtra.Wpf.csproj +++ b/GridExtra.Wpf/GridExtra.Wpf.csproj @@ -22,13 +22,4 @@ TRACE;WINDOWS_WPF - - - - - - - - - \ No newline at end of file From ba19798d839ba8311c8985abaa44757d068c385c Mon Sep 17 00:00:00 2001 From: Jozef Chmelar ml Date: Fri, 7 Aug 2020 16:16:21 +0200 Subject: [PATCH 3/3] Bumped minor version Fixed nuspec file to include more versions --- GridExtra.Wpf/GridExtra.Wpf.csproj | 4 ++-- Nuget/GridExtra.nuspec | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/GridExtra.Wpf/GridExtra.Wpf.csproj b/GridExtra.Wpf/GridExtra.Wpf.csproj index 0dc26c7..991cf43 100644 --- a/GridExtra.Wpf/GridExtra.Wpf.csproj +++ b/GridExtra.Wpf/GridExtra.Wpf.csproj @@ -8,8 +8,8 @@ SourceChord GridExtra.Wpf Copyright © 2016 - 0.4.0.0 - 0.4.0.0 + 0.5.0.0 + 0.5.0.0 ..\Build\Wpf\$(Configuration)\ true diff --git a/Nuget/GridExtra.nuspec b/Nuget/GridExtra.nuspec index e189238..243ba5d 100644 --- a/Nuget/GridExtra.nuspec +++ b/Nuget/GridExtra.nuspec @@ -2,7 +2,7 @@ GridExtra - 0.4.0 + 0.5.0 GridExtra SourceChord SourceChord @@ -14,7 +14,8 @@ XAML WPF UWP Panel Library - + + \ No newline at end of file