Skip to content

Commit fbea8b4

Browse files
Dirkster99Dirkster99
committed
vonverting MLibTest demo libraries to multitargeting ntcore3 and net4.5
1 parent 813f4ba commit fbea8b4

File tree

9 files changed

+66
-421
lines changed

9 files changed

+66
-421
lines changed

‎source/AvalonDock.sln

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,40 @@ VisualStudioVersion = 16.0.28803.352
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLibTest", "MLibTest\MLibTest\MLibTest.csproj", "{7FF2F70A-36A0-49FE-BE5B-1A1542516307}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{339BC0D5-2A54-40ED-9850-7ED65182E6E1}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "TestApp\TestApp.csproj", "{339BC0D5-2A54-40ED-9850-7ED65182E6E1}"
88
EndProject
99
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVMTestApp", "MVVMTestApp\MVVMTestApp.csproj", "{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}"
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Projects", "Test Projects", "{1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}"
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AvalonDock", "AvalonDock", "{B0EB64E3-2C25-46CC-BBB6-E38EF2584177}"
1414
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock", "Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock", "Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2013", "Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj", "{BD7EEE0E-9432-4E76-BD82-793358E56BDF}"
2222
EndProject
2323
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest_Components", "MLibTest_Components", "{72045D3A-A982-4C69-8FB8-6B601363D7ED}"
2424
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceLocator", "MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj", "{252126D1-E1D9-49C3-910B-FCF2266265EF}"
26-
EndProject
2725
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj", "{2807B493-CC2E-402E-901A-EB138698FEDC}"
2826
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsModel", "MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj", "{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}"
30-
EndProject
3127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsTestApp", "WinFormsTestApp\WinFormsTestApp.csproj", "{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}"
3228
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Components\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
3430
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Components\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
3632
EndProject
3733
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomationTest", "AutomationTest", "{20876020-CC7D-46BD-9B80-E4F01FC0FD31}"
3834
EndProject
3935
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Test", "AutomationTest\Xceed.Wpf.AvalonDock.Test\Xceed.Wpf.AvalonDock.Test.csproj", "{FE4E16A2-876A-4356-9974-8A89C50B2A5A}"
4036
EndProject
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceLocator", "MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj", "{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsModel", "MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj", "{8A6923BD-563B-4258-B4E6-AD651BBF1962}"
40+
EndProject
4141
Global
4242
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4343
Debug|Any CPU = Debug|Any CPU
@@ -132,18 +132,6 @@ Global
132132
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x64.Build.0 = Release|Any CPU
133133
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.ActiveCfg = Release|Any CPU
134134
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.Build.0 = Release|Any CPU
135-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
136-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
137-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x64.ActiveCfg = Debug|x64
138-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x64.Build.0 = Debug|x64
139-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x86.ActiveCfg = Debug|x86
140-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x86.Build.0 = Debug|x86
141-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
142-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|Any CPU.Build.0 = Release|Any CPU
143-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|x64.ActiveCfg = Release|x64
144-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|x64.Build.0 = Release|x64
145-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|x86.ActiveCfg = Release|x86
146-
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Release|x86.Build.0 = Release|x86
147135
{2807B493-CC2E-402E-901A-EB138698FEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148136
{2807B493-CC2E-402E-901A-EB138698FEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
149137
{2807B493-CC2E-402E-901A-EB138698FEDC}.Debug|x64.ActiveCfg = Debug|x64
@@ -156,18 +144,6 @@ Global
156144
{2807B493-CC2E-402E-901A-EB138698FEDC}.Release|x64.Build.0 = Release|x64
157145
{2807B493-CC2E-402E-901A-EB138698FEDC}.Release|x86.ActiveCfg = Release|x86
158146
{2807B493-CC2E-402E-901A-EB138698FEDC}.Release|x86.Build.0 = Release|x86
159-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
160-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
161-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|x64.ActiveCfg = Debug|x64
162-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|x64.Build.0 = Debug|x64
163-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|x86.ActiveCfg = Debug|x86
164-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Debug|x86.Build.0 = Debug|x86
165-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
166-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|Any CPU.Build.0 = Release|Any CPU
167-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x64.ActiveCfg = Release|x64
168-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x64.Build.0 = Release|x64
169-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x86.ActiveCfg = Release|x86
170-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x86.Build.0 = Release|x86
171147
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172148
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
173149
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|x64.ActiveCfg = Debug|x64
@@ -216,6 +192,30 @@ Global
216192
{FE4E16A2-876A-4356-9974-8A89C50B2A5A}.Release|x64.Build.0 = Release|Any CPU
217193
{FE4E16A2-876A-4356-9974-8A89C50B2A5A}.Release|x86.ActiveCfg = Release|Any CPU
218194
{FE4E16A2-876A-4356-9974-8A89C50B2A5A}.Release|x86.Build.0 = Release|Any CPU
195+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
196+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
197+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|x64.ActiveCfg = Debug|Any CPU
198+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|x64.Build.0 = Debug|Any CPU
199+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|x86.ActiveCfg = Debug|Any CPU
200+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Debug|x86.Build.0 = Debug|Any CPU
201+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
202+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|Any CPU.Build.0 = Release|Any CPU
203+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|x64.ActiveCfg = Release|Any CPU
204+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|x64.Build.0 = Release|Any CPU
205+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|x86.ActiveCfg = Release|Any CPU
206+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}.Release|x86.Build.0 = Release|Any CPU
207+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|Any CPU.Build.0 = Debug|Any CPU
209+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|x64.ActiveCfg = Debug|Any CPU
210+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|x64.Build.0 = Debug|Any CPU
211+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|x86.ActiveCfg = Debug|Any CPU
212+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Debug|x86.Build.0 = Debug|Any CPU
213+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|Any CPU.ActiveCfg = Release|Any CPU
214+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|Any CPU.Build.0 = Release|Any CPU
215+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x64.ActiveCfg = Release|Any CPU
216+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x64.Build.0 = Release|Any CPU
217+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x86.ActiveCfg = Release|Any CPU
218+
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x86.Build.0 = Release|Any CPU
219219
EndGlobalSection
220220
GlobalSection(SolutionProperties) = preSolution
221221
HideSolutionNode = FALSE
@@ -229,14 +229,14 @@ Global
229229
{89286EB4-B4A1-418C-839A-067B00F442D8} = {B0EB64E3-2C25-46CC-BBB6-E38EF2584177}
230230
{BD7EEE0E-9432-4E76-BD82-793358E56BDF} = {B0EB64E3-2C25-46CC-BBB6-E38EF2584177}
231231
{72045D3A-A982-4C69-8FB8-6B601363D7ED} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
232-
{252126D1-E1D9-49C3-910B-FCF2266265EF} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
233232
{2807B493-CC2E-402E-901A-EB138698FEDC} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
234-
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
235233
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
236234
{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} = {B0EB64E3-2C25-46CC-BBB6-E38EF2584177}
237235
{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} = {B0EB64E3-2C25-46CC-BBB6-E38EF2584177}
238236
{20876020-CC7D-46BD-9B80-E4F01FC0FD31} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
239237
{FE4E16A2-876A-4356-9974-8A89C50B2A5A} = {20876020-CC7D-46BD-9B80-E4F01FC0FD31}
238+
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
239+
{8A6923BD-563B-4258-B4E6-AD651BBF1962} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
240240
EndGlobalSection
241241
GlobalSection(ExtensibilityGlobals) = postSolution
242242
SolutionGuid = {459B8289-CF04-4E70-AEC9-23DC3A6E66F6}

‎source/MLibTest/MLibTest/MLibTest.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -201,14 +201,14 @@
201201
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
202202
<Name>Xceed.Wpf.AvalonDock</Name>
203203
</ProjectReference>
204-
<ProjectReference Include="..\MLibTest_Components\ServiceLocator\ServiceLocator.csproj">
205-
<Project>{252126d1-e1d9-49c3-910b-fcf2266265ef}</Project>
206-
<Name>ServiceLocator</Name>
207-
</ProjectReference>
208204
<ProjectReference Include="..\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj">
209-
<Project>{9b0ba841-5a2f-4ed3-a908-253dbca70e77}</Project>
205+
<Project>{8a6923bd-563b-4258-b4e6-ad651bbf1962}</Project>
210206
<Name>SettingsModel</Name>
211207
</ProjectReference>
208+
<ProjectReference Include="..\MLibTest_Components\ServiceLocator\ServiceLocator.csproj">
209+
<Project>{38f7f15d-2f13-49e4-b4e6-b9552072afcd}</Project>
210+
<Name>ServiceLocator</Name>
211+
</ProjectReference>
212212
<ProjectReference Include="..\MLibTest_Components\Settings\Settings\Settings.csproj">
213213
<Project>{2807b493-cc2e-402e-901a-eb138698fedc}</Project>
214214
<Name>Settings</Name>

‎source/MLibTest/MLibTest_Components/ServiceLocator/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj

Lines changed: 5 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{252126D1-E1D9-49C3-910B-FCF2266265EF}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ServiceLocator</RootNamespace>
11-
<AssemblyName>ServiceLocator</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>netcoreapp3.0;net4.5</TargetFrameworks>
145
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
33-
<DebugSymbols>true</DebugSymbols>
34-
<OutputPath>bin\x64\Debug\</OutputPath>
35-
<DefineConstants>DEBUG;TRACE</DefineConstants>
36-
<DebugType>full</DebugType>
37-
<PlatformTarget>x64</PlatformTarget>
38-
<ErrorReport>prompt</ErrorReport>
39-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
40-
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
42-
<OutputPath>bin\x64\Release\</OutputPath>
43-
<DefineConstants>TRACE</DefineConstants>
44-
<Optimize>true</Optimize>
45-
<DebugType>pdbonly</DebugType>
46-
<PlatformTarget>x64</PlatformTarget>
47-
<ErrorReport>prompt</ErrorReport>
48-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
49-
</PropertyGroup>
50-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
51-
<DebugSymbols>true</DebugSymbols>
52-
<OutputPath>bin\x86\Debug\</OutputPath>
53-
<DefineConstants>DEBUG;TRACE</DefineConstants>
54-
<DebugType>full</DebugType>
55-
<PlatformTarget>x86</PlatformTarget>
56-
<ErrorReport>prompt</ErrorReport>
57-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
58-
</PropertyGroup>
59-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
60-
<OutputPath>bin\x86\Release\</OutputPath>
61-
<DefineConstants>TRACE</DefineConstants>
62-
<Optimize>true</Optimize>
63-
<DebugType>pdbonly</DebugType>
64-
<PlatformTarget>x86</PlatformTarget>
65-
<ErrorReport>prompt</ErrorReport>
66-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
67-
</PropertyGroup>
68-
<ItemGroup>
69-
<Reference Include="System" />
70-
<Reference Include="System.Core" />
71-
<Reference Include="Microsoft.CSharp" />
72-
<Reference Include="System.Data" />
73-
<Reference Include="System.Xml" />
74-
</ItemGroup>
75-
<ItemGroup>
76-
<Compile Include="ServiceContainer.cs" />
77-
<Compile Include="Properties\AssemblyInfo.cs" />
78-
</ItemGroup>
79-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
80-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
81-
Other similar extension points exist, see Microsoft.Common.targets.
82-
<Target Name="BeforeBuild">
83-
</Target>
84-
<Target Name="AfterBuild">
85-
</Target>
86-
-->
87-
</Project>
6+
7+
</Project>

‎source/MLibTest/MLibTest_Components/Settings/Settings/Settings.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -105,15 +105,15 @@
105105
<Compile Include="UserProfile\ViewPosSizeModel.cs" />
106106
<Compile Include="UserProfile\ViewSize.cs" />
107107
</ItemGroup>
108+
<ItemGroup>
109+
<None Include="packages.config" />
110+
</ItemGroup>
108111
<ItemGroup>
109112
<ProjectReference Include="..\SettingsModel\SettingsModel.csproj">
110-
<Project>{9b0ba841-5a2f-4ed3-a908-253dbca70e77}</Project>
113+
<Project>{8a6923bd-563b-4258-b4e6-ad651bbf1962}</Project>
111114
<Name>SettingsModel</Name>
112115
</ProjectReference>
113116
</ItemGroup>
114-
<ItemGroup>
115-
<None Include="packages.config" />
116-
</ItemGroup>
117117
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118118
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119119
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)