From e104505aad5041b09d9620cb3f956ab24298fedb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=9B=90=EC=98=81/Common=20Platform=20Lab=28SR=29?= =?utf8?q?/Staff=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 26 Mar 2020 15:45:13 +0900 Subject: [PATCH] Build net461 assembly with dotnet-cli (#168) The Microsoft.NETFramework.ReferenceAssemblies can be used to build .NETFramework assemblies with dotnet-cli. We don't need to use Mono for building net461 assembly of XSF.Build.Tasks anymore. So commands of ./build.sh are changed as following: - ./build.sh msbuild --> Removed - ./build.sh dotnet --> ./build.sh build --- XSF.Build.sln | 69 ++++++++++++ XSF.sln | 174 +++++++++++++++++++++++++++++ build.sh | 24 ++-- packaging/xsf.spec | 2 +- src/XSF.Build.Tasks/XSF.Build.Tasks.csproj | 2 +- src/XSF.sln | 118 ------------------- 6 files changed, 252 insertions(+), 137 deletions(-) create mode 100644 XSF.Build.sln create mode 100644 XSF.sln delete mode 100755 src/XSF.sln diff --git a/XSF.Build.sln b/XSF.Build.sln new file mode 100644 index 0000000..e2f37c8 --- /dev/null +++ b/XSF.Build.sln @@ -0,0 +1,69 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0C227E7-5AB8-4E6E-87B8-BABE1E0A56CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSF.Build.Tasks", "src\XSF.Build.Tasks\XSF.Build.Tasks.csproj", "{B5988F1A-127D-4E83-B0F4-1C9314A207A2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSF.Design", "src\XSF.Design\XSF.Design.csproj", "{7B8A8C07-5565-428B-BDCB-B543E8A9A537}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSF", "src\XSF\XSF.csproj", "{0E9EB553-1AA0-4467-BF14-575530D9740D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|x64.Build.0 = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|x86.ActiveCfg = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Debug|x86.Build.0 = Debug|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|Any CPU.Build.0 = Release|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|x64.ActiveCfg = Release|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|x64.Build.0 = Release|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|x86.ActiveCfg = Release|Any CPU + {B5988F1A-127D-4E83-B0F4-1C9314A207A2}.Release|x86.Build.0 = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|x64.ActiveCfg = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|x64.Build.0 = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|x86.ActiveCfg = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Debug|x86.Build.0 = Debug|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|Any CPU.Build.0 = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|x64.ActiveCfg = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|x64.Build.0 = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|x86.ActiveCfg = Release|Any CPU + {7B8A8C07-5565-428B-BDCB-B543E8A9A537}.Release|x86.Build.0 = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|x64.ActiveCfg = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|x64.Build.0 = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|x86.ActiveCfg = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Debug|x86.Build.0 = Debug|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|Any CPU.Build.0 = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|x64.ActiveCfg = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|x64.Build.0 = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|x86.ActiveCfg = Release|Any CPU + {0E9EB553-1AA0-4467-BF14-575530D9740D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B5988F1A-127D-4E83-B0F4-1C9314A207A2} = {A0C227E7-5AB8-4E6E-87B8-BABE1E0A56CC} + {7B8A8C07-5565-428B-BDCB-B543E8A9A537} = {A0C227E7-5AB8-4E6E-87B8-BABE1E0A56CC} + {0E9EB553-1AA0-4467-BF14-575530D9740D} = {A0C227E7-5AB8-4E6E-87B8-BABE1E0A56CC} + EndGlobalSection +EndGlobal diff --git a/XSF.sln b/XSF.sln new file mode 100644 index 0000000..e28e0c9 --- /dev/null +++ b/XSF.sln @@ -0,0 +1,174 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29920.165 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF", "src\XSF\XSF.csproj", "{8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF.Build.Tasks", "src\XSF.Build.Tasks\XSF.Build.Tasks.csproj", "{4D093123-296A-4471-A97F-58E5F8F2948D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF.Design", "src\XSF.Design\XSF.Design.csproj", "{184A0570-F7D8-4207-9B8C-CA48C018FEA8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{CC822123-464F-4FF8-9E0B-2467946E07B6}" + ProjectSection(SolutionItems) = preProject + .nuspec\XSF.DefaultItems.props = .nuspec\XSF.DefaultItems.props + .nuspec\XSF.DefaultItems.targets = .nuspec\XSF.DefaultItems.targets + .nuspec\XSF.nuspec = .nuspec\XSF.nuspec + .nuspec\XSF.props = .nuspec\XSF.props + .nuspec\XSF.targets = .nuspec\XSF.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D11032F-BD24-413A-ABB2-AFAC1E357697}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + build.sh = build.sh + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BCEBC994-EAB5-4142-B60C-58FED3DFC835}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alarm", "test\Alarm\Alarm\Alarm.csproj", "{B6813215-D04E-44BA-8AF6-72EDA675C99C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator", "test\Calculator\Calculator\Calculator.csproj", "{BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeartRateMonitor", "test\HeartRateMonitor\HeartRateMonitor.csproj", "{39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceMemo", "test\Voicememo2020\VoiceMemo\VoiceMemo.csproj", "{7A4D58D3-EF64-46FC-B293-75F71D9938DF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weather", "test\Weather\Weather\Weather.csproj", "{198A2943-3091-46FB-B967-B85D26496025}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XStopWatch", "test\XStopWatch\XStopWatch.csproj", "{A689445F-79CA-4843-BB47-B39860C863CD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|x64.ActiveCfg = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|x64.Build.0 = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|x86.ActiveCfg = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Debug|x86.Build.0 = Debug|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|Any CPU.Build.0 = Release|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|x64.ActiveCfg = Release|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|x64.Build.0 = Release|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|x86.ActiveCfg = Release|Any CPU + {8CCD862D-0BB5-4350-9B0C-286CD3A6A7FF}.Release|x86.Build.0 = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|x64.ActiveCfg = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|x64.Build.0 = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|x86.ActiveCfg = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Debug|x86.Build.0 = Debug|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|Any CPU.Build.0 = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|x64.ActiveCfg = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|x64.Build.0 = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|x86.ActiveCfg = Release|Any CPU + {4D093123-296A-4471-A97F-58E5F8F2948D}.Release|x86.Build.0 = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|x64.ActiveCfg = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|x64.Build.0 = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|x86.ActiveCfg = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Debug|x86.Build.0 = Debug|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|Any CPU.Build.0 = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|x64.ActiveCfg = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|x64.Build.0 = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|x86.ActiveCfg = Release|Any CPU + {184A0570-F7D8-4207-9B8C-CA48C018FEA8}.Release|x86.Build.0 = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|x64.ActiveCfg = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|x64.Build.0 = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|x86.ActiveCfg = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Debug|x86.Build.0 = Debug|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|Any CPU.Build.0 = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|x64.ActiveCfg = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|x64.Build.0 = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|x86.ActiveCfg = Release|Any CPU + {B6813215-D04E-44BA-8AF6-72EDA675C99C}.Release|x86.Build.0 = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|x64.ActiveCfg = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|x64.Build.0 = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|x86.ActiveCfg = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Debug|x86.Build.0 = Debug|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|Any CPU.Build.0 = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|x64.ActiveCfg = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|x64.Build.0 = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|x86.ActiveCfg = Release|Any CPU + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC}.Release|x86.Build.0 = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|x64.Build.0 = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|x86.ActiveCfg = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Debug|x86.Build.0 = Debug|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|Any CPU.Build.0 = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|x64.ActiveCfg = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|x64.Build.0 = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|x86.ActiveCfg = Release|Any CPU + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5}.Release|x86.Build.0 = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|x64.ActiveCfg = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|x64.Build.0 = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|x86.ActiveCfg = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Debug|x86.Build.0 = Debug|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|Any CPU.Build.0 = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|x64.ActiveCfg = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|x64.Build.0 = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|x86.ActiveCfg = Release|Any CPU + {7A4D58D3-EF64-46FC-B293-75F71D9938DF}.Release|x86.Build.0 = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|Any CPU.Build.0 = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|x64.ActiveCfg = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|x64.Build.0 = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|x86.ActiveCfg = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Debug|x86.Build.0 = Debug|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|Any CPU.ActiveCfg = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|Any CPU.Build.0 = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|x64.ActiveCfg = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|x64.Build.0 = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|x86.ActiveCfg = Release|Any CPU + {198A2943-3091-46FB-B967-B85D26496025}.Release|x86.Build.0 = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|x64.ActiveCfg = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|x64.Build.0 = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|x86.ActiveCfg = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Debug|x86.Build.0 = Debug|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|Any CPU.Build.0 = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|x64.ActiveCfg = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|x64.Build.0 = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|x86.ActiveCfg = Release|Any CPU + {A689445F-79CA-4843-BB47-B39860C863CD}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B6813215-D04E-44BA-8AF6-72EDA675C99C} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + {BBB4DF2B-9D77-465B-A1C8-4EAD42F561BC} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + {39D1AD7A-80D6-47F8-A6C7-93E4D25F84E5} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + {7A4D58D3-EF64-46FC-B293-75F71D9938DF} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + {198A2943-3091-46FB-B967-B85D26496025} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + {A689445F-79CA-4843-BB47-B39860C863CD} = {BCEBC994-EAB5-4142-B60C-58FED3DFC835} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4312D28C-6473-4391-B1AF-AAAFAF4FA0C1} + EndGlobalSection +EndGlobal diff --git a/build.sh b/build.sh index 933d557..1346e74 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(dirname $SCRIPT_FILE) XSF_DIR="$SCRIPT_DIR/src/XSF" XSF_BUILD_TASKS_DIR="$SCRIPT_DIR/src/XSF.Build.Tasks" XSF_DESIGN_DIR="$SCRIPT_DIR/src/XSF.Design" -XSF_SOLUTION="$SCRIPT_DIR/src/XSF.sln" +XSF_BUILD_SOLUTION="$SCRIPT_DIR/XSF.Build.sln" NUSPEC_DIR="$SCRIPT_DIR/.nuspec" BUILD_CONF=Release @@ -16,32 +16,23 @@ version_prefix() { } cmd_clean() { + dotnet clean --nologo $XSF_BUILD_SOLUTION rm -fr $NUSPEC_DIR/bin $NUSPEC_DIR/obj rm -fr $XSF_DIR/bin $XSF_DIR/obj rm -fr $XSF_BUILD_TASKS_DIR/bin $XSF_BUILD_TASKS_DIR/obj rm -fr $XSF_DESIGN_DIR/bin $XSF_DESIGN_DIR/obj } -# Build XSF using msbuild of Mono to obtain net461 assembly of XSF.Build.Tasks -# It is used to create a NuGet package for release in CI. -cmd_msbuild() { - cmd_clean - msbuild /t:restore $XSF_SOLUTION - msbuild /t:rebuild /p:Configuration=$BUILD_CONF $XSF_SOLUTION -} - -# Build XSF using dotnet cli of .NETCore for debugging or GBS build. +# Build XSF using dotnet cli of .NETCore. # In GBS build, "local" should be used to avoid network problems in GBS environment. -cmd_dotnet() { - cmd_clean +cmd_build() { if [ "$1" == "local" ]; then shift echo "Use local packages in $SCRIPT_DIR/packages" - dotnet restore -s "$SCRIPT_DIR/packages" $XSF_SOLUTION + dotnet restore -s "$SCRIPT_DIR/packages" $XSF_BUILD_SOLUTION BUILD_ARGS="--no-restore" fi - - dotnet build --nologo -f netstandard2.0 -c $BUILD_CONF $BUILD_ARGS $@ $XSF_SOLUTION + dotnet build --nologo -c $BUILD_CONF $BUILD_ARGS $@ $XSF_BUILD_SOLUTION } cmd_pack() { @@ -65,8 +56,7 @@ cmd_pack() { cmd=$1; [ $# -gt 0 ] && shift; case "$cmd" in clean) cmd_clean $@ && exit 0 ;; - dotnet | "") cmd_dotnet $@ && exit 0 ;; - msbuild) cmd_msbuild $@ && exit 0 ;; + build | "") cmd_build $@ && exit 0 ;; pack) cmd_pack $@ && exit 0 ;; *) echo "Invalid command" && exit 1 ;; esac diff --git a/packaging/xsf.spec b/packaging/xsf.spec index f661406..56f9b1e 100644 --- a/packaging/xsf.spec +++ b/packaging/xsf.spec @@ -32,7 +32,7 @@ cp %{SOURCE1} . export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true cp %{DOTNET_NUGET_SOURCE}/*.nupkg ./packages/ -./build.sh dotnet local +./build.sh build local %install mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} diff --git a/src/XSF.Build.Tasks/XSF.Build.Tasks.csproj b/src/XSF.Build.Tasks/XSF.Build.Tasks.csproj index 1c874f2..41f4bfc 100644 --- a/src/XSF.Build.Tasks/XSF.Build.Tasks.csproj +++ b/src/XSF.Build.Tasks/XSF.Build.Tasks.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/XSF.sln b/src/XSF.sln deleted file mode 100755 index 80160ed..0000000 --- a/src/XSF.sln +++ /dev/null @@ -1,118 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29806.167 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF", "XSF\XSF.csproj", "{97C745F8-9099-4411-933A-019BCC41AA5B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF.Build.Tasks", "XSF.Build.Tasks\XSF.Build.Tasks.csproj", "{54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSF.Design", "XSF.Design\XSF.Design.csproj", "{6E6E2C42-2FA1-4CC2-A164-75895DCEBC40}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{939D3D7E-8F05-42EE-B0DF-C259839CAD2D}" - ProjectSection(SolutionItems) = preProject - ..\.nuspec\XSF.DefaultItems.props = ..\.nuspec\XSF.DefaultItems.props - ..\.nuspec\XSF.DefaultItems.targets = ..\.nuspec\XSF.DefaultItems.targets - ..\.nuspec\XSF.nuspec = ..\.nuspec\XSF.nuspec - ..\.nuspec\XSF.props = ..\.nuspec\XSF.props - ..\.nuspec\XSF.targets = ..\.nuspec\XSF.targets - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{54791DDF-D1DB-48FD-B10E-7F6D48FBE858}" - ProjectSection(SolutionItems) = preProject - ..\.editorconfig = ..\.editorconfig - ..\build.sh = ..\build.sh - XSF.snk = XSF.snk - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2AB5E7BD-4759-4031-967C-79BDF7746D8B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XStopWatch", "..\test\XStopWatch\XStopWatch.csproj", "{1D2AFB0D-F074-466C-8153-DB8F5E07B093}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alarm", "..\test\Alarm\Alarm\Alarm.csproj", "{8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator", "..\test\Calculator\Calculator\Calculator.csproj", "{D9BDB76D-0717-4BC7-BF05-2090CA24FB52}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeartRateMonitor", "..\test\HeartRateMonitor\HeartRateMonitor.csproj", "{48667162-B899-4BDC-A721-A8FA8D2FC1E3}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceMemo", "..\test\Voicememo2020\VoiceMemo\VoiceMemo.csproj", "{CE718C63-1D7D-44B2-93D9-D0E9F42E5901}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weather", "..\test\Weather\Weather\Weather.csproj", "{BF967F5A-5214-451E-8004-4A6C1007026F}" - ProjectSection(ProjectDependencies) = postProject - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {97C745F8-9099-4411-933A-019BCC41AA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97C745F8-9099-4411-933A-019BCC41AA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97C745F8-9099-4411-933A-019BCC41AA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97C745F8-9099-4411-933A-019BCC41AA5B}.Release|Any CPU.Build.0 = Release|Any CPU - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}.Release|Any CPU.Build.0 = Release|Any CPU - {6E6E2C42-2FA1-4CC2-A164-75895DCEBC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E6E2C42-2FA1-4CC2-A164-75895DCEBC40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E6E2C42-2FA1-4CC2-A164-75895DCEBC40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E6E2C42-2FA1-4CC2-A164-75895DCEBC40}.Release|Any CPU.Build.0 = Release|Any CPU - {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Release|Any CPU.Build.0 = Release|Any CPU - {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Release|Any CPU.Build.0 = Release|Any CPU - {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Release|Any CPU.Build.0 = Release|Any CPU - {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Release|Any CPU.Build.0 = Release|Any CPU - {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Release|Any CPU.Build.0 = Release|Any CPU - {BF967F5A-5214-451E-8004-4A6C1007026F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF967F5A-5214-451E-8004-4A6C1007026F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF967F5A-5214-451E-8004-4A6C1007026F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF967F5A-5214-451E-8004-4A6C1007026F}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1D2AFB0D-F074-466C-8153-DB8F5E07B093} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - {D9BDB76D-0717-4BC7-BF05-2090CA24FB52} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - {48667162-B899-4BDC-A721-A8FA8D2FC1E3} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - {CE718C63-1D7D-44B2-93D9-D0E9F42E5901} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - {BF967F5A-5214-451E-8004-4A6C1007026F} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2671CF0D-9604-4B78-BE93-3E5C392B1065} - SolutionGuid = {38E1EEEE-8DAE-418F-8F52-AF552950601F} - EndGlobalSection -EndGlobal -- 2.7.4