Skip to content

Commit 896bbc6

Browse files
Dirkster99Dirkster99
committed
Multitargeting Net 4.5.2 and NetCore 3 with MLibTest
1 parent fbea8b4 commit 896bbc6

File tree

9 files changed

+75
-508
lines changed

9 files changed

+75
-508
lines changed

‎source/AvalonDock.sln

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 16
33
VisualStudioVersion = 16.0.28803.352
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLibTest", "MLibTest\MLibTest\MLibTest.csproj", "{7FF2F70A-36A0-49FE-BE5B-1A1542516307}"
6-
EndProject
75
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "TestApp\TestApp.csproj", "{339BC0D5-2A54-40ED-9850-7ED65182E6E1}"
86
EndProject
97
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVMTestApp", "MVVMTestApp\MVVMTestApp.csproj", "{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}"
@@ -36,7 +34,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Test",
3634
EndProject
3735
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceLocator", "MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj", "{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}"
3836
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsModel", "MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj", "{8A6923BD-563B-4258-B4E6-AD651BBF1962}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsModel", "MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj", "{8A6923BD-563B-4258-B4E6-AD651BBF1962}"
38+
EndProject
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MLibTest", "MLibTest\MLibTest\MLibTest.csproj", "{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}"
4040
EndProject
4141
Global
4242
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -48,18 +48,6 @@ Global
4848
Release|x86 = Release|x86
4949
EndGlobalSection
5050
GlobalSection(ProjectConfigurationPlatforms) = postSolution
51-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|x64.ActiveCfg = Debug|Any CPU
54-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|x64.Build.0 = Debug|Any CPU
55-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|x86.ActiveCfg = Debug|Any CPU
56-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Debug|x86.Build.0 = Debug|Any CPU
57-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|Any CPU.ActiveCfg = Release|Any CPU
58-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|Any CPU.Build.0 = Release|Any CPU
59-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|x64.ActiveCfg = Release|Any CPU
60-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|x64.Build.0 = Release|Any CPU
61-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|x86.ActiveCfg = Release|Any CPU
62-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307}.Release|x86.Build.0 = Release|Any CPU
6351
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6452
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
6553
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -216,12 +204,23 @@ Global
216204
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x64.Build.0 = Release|Any CPU
217205
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x86.ActiveCfg = Release|Any CPU
218206
{8A6923BD-563B-4258-B4E6-AD651BBF1962}.Release|x86.Build.0 = Release|Any CPU
207+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
209+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|x64.ActiveCfg = Debug|Any CPU
210+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|x64.Build.0 = Debug|Any CPU
211+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|x86.ActiveCfg = Debug|Any CPU
212+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Debug|x86.Build.0 = Debug|Any CPU
213+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
214+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|Any CPU.Build.0 = Release|Any CPU
215+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|x64.ActiveCfg = Release|Any CPU
216+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|x64.Build.0 = Release|Any CPU
217+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|x86.ActiveCfg = Release|Any CPU
218+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD}.Release|x86.Build.0 = Release|Any CPU
219219
EndGlobalSection
220220
GlobalSection(SolutionProperties) = preSolution
221221
HideSolutionNode = FALSE
222222
EndGlobalSection
223223
GlobalSection(NestedProjects) = preSolution
224-
{7FF2F70A-36A0-49FE-BE5B-1A1542516307} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
225224
{339BC0D5-2A54-40ED-9850-7ED65182E6E1} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
226225
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
227226
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244} = {B0EB64E3-2C25-46CC-BBB6-E38EF2584177}
@@ -237,6 +236,7 @@ Global
237236
{FE4E16A2-876A-4356-9974-8A89C50B2A5A} = {20876020-CC7D-46BD-9B80-E4F01FC0FD31}
238237
{38F7F15D-2F13-49E4-B4E6-B9552072AFCD} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
239238
{8A6923BD-563B-4258-B4E6-AD651BBF1962} = {72045D3A-A982-4C69-8FB8-6B601363D7ED}
239+
{DB5F3CB8-214B-4EAB-83D2-2AF4EF3D60AD} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
240240
EndGlobalSection
241241
GlobalSection(ExtensibilityGlobals) = postSolution
242242
SolutionGuid = {459B8289-CF04-4E70-AEC9-23DC3A6E66F6}

‎source/MLibTest/MLibTest/App.config

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

‎source/MLibTest/MLibTest/MLibTest.csproj

Lines changed: 59 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -1,236 +1,84 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" 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.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{7FF2F70A-36A0-49FE-BE5B-1A1542516307}</ProjectGuid>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>MLibTest</RootNamespace>
10-
<AssemblyName>MLibTest</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16-
<TargetFrameworkProfile />
17-
<PublishUrl>publish\</PublishUrl>
18-
<Install>true</Install>
19-
<InstallFrom>Disk</InstallFrom>
20-
<UpdateEnabled>false</UpdateEnabled>
21-
<UpdateMode>Foreground</UpdateMode>
22-
<UpdateInterval>7</UpdateInterval>
23-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
24-
<UpdatePeriodically>false</UpdatePeriodically>
25-
<UpdateRequired>false</UpdateRequired>
26-
<MapFileExtensions>true</MapFileExtensions>
27-
<ApplicationRevision>0</ApplicationRevision>
28-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
29-
<IsWebBootstrapper>false</IsWebBootstrapper>
30-
<UseApplicationTrust>false</UseApplicationTrust>
31-
<BootstrapperEnabled>true</BootstrapperEnabled>
5+
<TargetFrameworks>netcoreapp3.0;net4.5.2</TargetFrameworks>
6+
<UseWPF>true</UseWPF>
327
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
34-
<PlatformTarget>AnyCPU</PlatformTarget>
35-
<DebugSymbols>true</DebugSymbols>
36-
<DebugType>full</DebugType>
37-
<Optimize>false</Optimize>
38-
<OutputPath>bin\Debug\</OutputPath>
39-
<DefineConstants>
40-
</DefineConstants>
41-
<ErrorReport>prompt</ErrorReport>
42-
<WarningLevel>4</WarningLevel>
43-
</PropertyGroup>
44-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
45-
<PlatformTarget>AnyCPU</PlatformTarget>
46-
<DebugType>pdbonly</DebugType>
47-
<Optimize>true</Optimize>
48-
<OutputPath>bin\Release\</OutputPath>
49-
<DefineConstants>TRACE</DefineConstants>
50-
<ErrorReport>prompt</ErrorReport>
51-
<WarningLevel>4</WarningLevel>
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
10+
<DefineConstants />
5211
</PropertyGroup>
12+
5313
<ItemGroup>
54-
<Reference Include="ColorPickerLib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Dirkster.ColorPickerLib.1.5.1\lib\net4\ColorPickerLib.dll</HintPath>
56-
</Reference>
57-
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\Microsoft.Expression.Interactions.dll</HintPath>
59-
</Reference>
60-
<Reference Include="MLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\Dirkster.MLib.1.2.0\lib\net4\MLib.dll</HintPath>
62-
</Reference>
63-
<Reference Include="MWindowInterfacesLib, Version=1.0.4.2, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\MWindowInterfacesLib.dll</HintPath>
65-
</Reference>
66-
<Reference Include="MWindowLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\MWindowLib.dll</HintPath>
68-
</Reference>
69-
<Reference Include="NumericUpDownLib, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Dirkster.NumericUpDownLib.2.3.1\lib\net4\NumericUpDownLib.dll</HintPath>
71-
</Reference>
72-
<Reference Include="System" />
73-
<Reference Include="System.Data" />
74-
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\System.Windows.Interactivity.dll</HintPath>
76-
</Reference>
77-
<Reference Include="System.Xml" />
78-
<Reference Include="Microsoft.CSharp" />
79-
<Reference Include="System.Core" />
80-
<Reference Include="System.Xml.Linq" />
81-
<Reference Include="System.Data.DataSetExtensions" />
82-
<Reference Include="System.Net.Http" />
83-
<Reference Include="System.Xaml">
84-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
85-
</Reference>
86-
<Reference Include="WindowsBase" />
87-
<Reference Include="PresentationCore" />
88-
<Reference Include="PresentationFramework" />
14+
<None Remove="Demos\Images\document.png" />
15+
<None Remove="Demos\Images\property-blue.png" />
8916
</ItemGroup>
17+
9018
<ItemGroup>
91-
<ApplicationDefinition Include="App.xaml">
92-
<Generator>MSBuild:Compile</Generator>
19+
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.0" />
20+
<PackageReference Include="Dirkster.MLib" Version="1.2.0" />
21+
<PackageReference Include="Dirkster.MWindowLib" Version="1.2.1" />
22+
<PackageReference Include="Dirkster.NumericUpDownLib" Version="2.4.0" />
23+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.0.1" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj" />
28+
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj" />
29+
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj" />
30+
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
31+
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj" />
32+
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj" />
33+
<ProjectReference Include="..\..\MLibTest\MLibTest_Components\Settings\Settings\Settings.csproj" />
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<Resource Include="Demos\Images\document.png" />
38+
<Resource Include="Demos\Images\property-blue.png" />
39+
</ItemGroup>
40+
41+
<ItemGroup>
42+
<ApplicationDefinition Update="App.xaml">
9343
<SubType>Designer</SubType>
44+
<Generator>MSBuild:Compile</Generator>
9445
</ApplicationDefinition>
95-
<Compile Include="Demos\Converters\ActiveDocumentConverter.cs" />
96-
<Compile Include="Demos\Converters\BoolToVisibilityConverter.cs" />
97-
<Compile Include="Demos\LayoutInitializer.cs" />
98-
<Compile Include="Demos\PanesStyleSelector.cs" />
99-
<Compile Include="Demos\PanesTemplateSelector.cs" />
100-
<Compile Include="Demos\ViewModels\Tools\Tool2_ViewModel.cs" />
101-
<Compile Include="Demos\ViewModels\Tools\Tool3_ViewModel.cs" />
102-
<Compile Include="Demos\ViewModels\Tools\Tool1_ViewModel.cs" />
103-
<Compile Include="Demos\ViewModels\AD\FileViewModel.cs" />
104-
<Compile Include="Demos\ViewModels\AD\PaneViewModel.cs" />
105-
<Compile Include="Demos\ViewModels\AD\ToolViewModel.cs" />
106-
<Compile Include="Demos\ViewModels\Interfaces\IWorkSpaceViewModel.cs" />
107-
<Compile Include="Demos\ViewModels\Tools\ColorPickerViewModel.cs" />
108-
<Compile Include="Demos\ViewModels\Tools\FileStatsViewModel.cs" />
109-
<Compile Include="Demos\ViewModels\WorkSpaceViewModel.cs" />
110-
<Compile Include="Demos\ViewModels\Views\ColorSelectionView.xaml.cs">
46+
</ItemGroup>
47+
48+
<ItemGroup>
49+
<Compile Update="App.xaml.cs">
50+
<SubType>Code</SubType>
51+
<DependentUpon>App.xaml</DependentUpon>
52+
</Compile>
53+
<Compile Update="Demos\ViewModels\Views\ColorSelectionView.xaml.cs">
11154
<DependentUpon>ColorSelectionView.xaml</DependentUpon>
11255
</Compile>
113-
<Compile Include="Models\AppCore.cs" />
114-
<Compile Include="Models\LayoutLoadedEventArgs.cs" />
115-
<Compile Include="Models\LayoutLoader.cs" />
116-
<Compile Include="Models\LayoutLoaderResult.cs" />
117-
<Compile Include="Models\SettingDefaults.cs" />
118-
<Compile Include="ServiceInjector.cs" />
119-
<Compile Include="ViewModels\AppLifeCycleViewModel.cs" />
120-
<Compile Include="ViewModels\AppViewModel.cs" />
121-
<Compile Include="ViewModels\Base\ModelBase.cs" />
122-
<Compile Include="ViewModels\Base\RelayCommand.cs" />
123-
<Compile Include="ViewModels\Base\ViewModelBase.cs" />
124-
<Compile Include="ViewModels\ThemeDefinitionViewModel.cs" />
125-
<Compile Include="ViewModels\ThemeViewModel.cs" />
126-
<Page Include="BindToMLib\AvalonDock_Dark_LightBrushs.xaml">
56+
<Compile Update="MainWindow.xaml.cs">
57+
<SubType>Code</SubType>
58+
<DependentUpon>MainWindow.xaml</DependentUpon>
59+
</Compile>
60+
</ItemGroup>
61+
62+
<ItemGroup>
63+
<Page Update="BindToMLib\AvalonDock_Dark_LightBrushs.xaml">
12764
<SubType>Designer</SubType>
128-
<Generator>MSBuild:Compile</Generator>
12965
</Page>
130-
<Page Include="BindToMLib\ColorPickerLib_DarkLightBrushs.xaml">
131-
<Generator>MSBuild:Compile</Generator>
66+
<Page Update="BindToMLib\ColorPickerLib_DarkLightBrushs.xaml">
13267
<SubType>Designer</SubType>
13368
</Page>
134-
<Page Include="BindToMLib\NumericUpDownLib_DarkLightBrushs.xaml">
135-
<Generator>MSBuild:Compile</Generator>
69+
<Page Update="BindToMLib\MWindowLib_DarkLightBrushs.xaml">
13670
<SubType>Designer</SubType>
13771
</Page>
138-
<Page Include="BindToMLib\MWindowLib_DarkLightBrushs.xaml">
139-
<Generator>MSBuild:Compile</Generator>
72+
<Page Update="BindToMLib\NumericUpDownLib_DarkLightBrushs.xaml">
14073
<SubType>Designer</SubType>
14174
</Page>
142-
<Page Include="Demos\ViewModels\Views\ColorSelectionView.xaml">
75+
<Page Update="Demos\ViewModels\Views\ColorSelectionView.xaml">
14376
<SubType>Designer</SubType>
144-
<Generator>MSBuild:Compile</Generator>
14577
</Page>
146-
<Page Include="MainWindow.xaml">
147-
<Generator>MSBuild:Compile</Generator>
78+
<Page Update="MainWindow.xaml">
14879
<SubType>Designer</SubType>
80+
<Generator>MSBuild:Compile</Generator>
14981
</Page>
150-
<Compile Include="App.xaml.cs">
151-
<DependentUpon>App.xaml</DependentUpon>
152-
<SubType>Code</SubType>
153-
</Compile>
154-
<Compile Include="Demos\BindingProxy.cs" />
155-
<Compile Include="MainWindow.xaml.cs">
156-
<DependentUpon>MainWindow.xaml</DependentUpon>
157-
<SubType>Code</SubType>
158-
</Compile>
159-
</ItemGroup>
160-
<ItemGroup>
161-
<Compile Include="Properties\AssemblyInfo.cs">
162-
<SubType>Code</SubType>
163-
</Compile>
164-
<Compile Include="Properties\Resources.Designer.cs">
165-
<AutoGen>True</AutoGen>
166-
<DesignTime>True</DesignTime>
167-
<DependentUpon>Resources.resx</DependentUpon>
168-
</Compile>
169-
<Compile Include="Properties\Settings.Designer.cs">
170-
<AutoGen>True</AutoGen>
171-
<DependentUpon>Settings.settings</DependentUpon>
172-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
173-
</Compile>
174-
<EmbeddedResource Include="Properties\Resources.resx">
175-
<Generator>ResXFileCodeGenerator</Generator>
176-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
177-
</EmbeddedResource>
178-
<None Include="packages.config" />
179-
<None Include="Properties\Settings.settings">
180-
<Generator>SettingsSingleFileGenerator</Generator>
181-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
182-
</None>
183-
</ItemGroup>
184-
<ItemGroup>
185-
<None Include="App.config" />
186-
</ItemGroup>
187-
<ItemGroup>
188-
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj">
189-
<Project>{488dd8f7-9d3c-4f53-bd1f-84a095d9bc10}</Project>
190-
<Name>Xceed.Wpf.AvalonDock.Themes.Expression</Name>
191-
</ProjectReference>
192-
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj">
193-
<Project>{89286eb4-b4a1-418c-839a-067b00f442d8}</Project>
194-
<Name>Xceed.Wpf.AvalonDock.Themes.Metro</Name>
195-
</ProjectReference>
196-
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock.Themes.VS2013\Xceed.Wpf.AvalonDock.Themes.VS2013.csproj">
197-
<Project>{bd7eee0e-9432-4e76-bd82-793358e56bdf}</Project>
198-
<Name>Xceed.Wpf.AvalonDock.Themes.VS2013</Name>
199-
</ProjectReference>
200-
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
201-
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
202-
<Name>Xceed.Wpf.AvalonDock</Name>
203-
</ProjectReference>
204-
<ProjectReference Include="..\MLibTest_Components\Settings\SettingsModel\SettingsModel.csproj">
205-
<Project>{8a6923bd-563b-4258-b4e6-ad651bbf1962}</Project>
206-
<Name>SettingsModel</Name>
207-
</ProjectReference>
208-
<ProjectReference Include="..\MLibTest_Components\ServiceLocator\ServiceLocator.csproj">
209-
<Project>{38f7f15d-2f13-49e4-b4e6-b9552072afcd}</Project>
210-
<Name>ServiceLocator</Name>
211-
</ProjectReference>
212-
<ProjectReference Include="..\MLibTest_Components\Settings\Settings\Settings.csproj">
213-
<Project>{2807b493-cc2e-402e-901a-eb138698fedc}</Project>
214-
<Name>Settings</Name>
215-
</ProjectReference>
216-
</ItemGroup>
217-
<ItemGroup>
218-
<Resource Include="Demos\Images\document.png" />
219-
</ItemGroup>
220-
<ItemGroup>
221-
<Resource Include="Demos\Images\property-blue.png" />
222-
</ItemGroup>
223-
<ItemGroup>
224-
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
225-
<Visible>False</Visible>
226-
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
227-
<Install>true</Install>
228-
</BootstrapperPackage>
229-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
230-
<Visible>False</Visible>
231-
<ProductName>.NET Framework 3.5 SP1</ProductName>
232-
<Install>false</Install>
233-
</BootstrapperPackage>
23482
</ItemGroup>
235-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
83+
23684
</Project>

0 commit comments

Comments
 (0)