|
|
@@ -2,10 +2,10 @@
|
|
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
<PropertyGroup>
|
|
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
|
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
|
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
|
|
<ProductVersion>8.0.30703</ProductVersion>
|
|
|
<SchemaVersion>2.0</SchemaVersion>
|
|
|
- <ProjectGuid>{B29100C8-6E7F-4C7D-91AB-0153D0D28663}</ProjectGuid>
|
|
|
+ <ProjectGuid>{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}</ProjectGuid>
|
|
|
<OutputType>WinExe</OutputType>
|
|
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
|
<RootNamespace>Editor</RootNamespace>
|
|
|
@@ -16,7 +16,8 @@
|
|
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
|
|
<WarningLevel>4</WarningLevel>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
|
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
|
|
+ <PlatformTarget>x86</PlatformTarget>
|
|
|
<DebugSymbols>true</DebugSymbols>
|
|
|
<DebugType>full</DebugType>
|
|
|
<Optimize>false</Optimize>
|
|
|
@@ -24,9 +25,9 @@
|
|
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
|
<ErrorReport>prompt</ErrorReport>
|
|
|
<WarningLevel>4</WarningLevel>
|
|
|
- <RunCodeAnalysis>true</RunCodeAnalysis>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
|
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
|
|
+ <PlatformTarget>x86</PlatformTarget>
|
|
|
<DebugType>pdbonly</DebugType>
|
|
|
<Optimize>true</Optimize>
|
|
|
<OutputPath>bin\Release\</OutputPath>
|
|
|
@@ -35,32 +36,11 @@
|
|
|
<WarningLevel>4</WarningLevel>
|
|
|
</PropertyGroup>
|
|
|
<ItemGroup>
|
|
|
- <Reference Include="AsyncCtpLibrary">
|
|
|
- <HintPath>..\Packages\AsynCtp\AsyncCtpLibrary.dll</HintPath>
|
|
|
- </Reference>
|
|
|
- <Reference Include="GalaSoft.MvvmLight.Extras.WPF4, Version=3.0.0.32852, Culture=neutral, PublicKeyToken=1673db7d5906b0ad, processorArchitecture=MSIL">
|
|
|
- <SpecificVersion>False</SpecificVersion>
|
|
|
- <HintPath>..\packages\MvvmLight.3.0.3\lib\net40\GalaSoft.MvvmLight.Extras.WPF4.dll</HintPath>
|
|
|
- </Reference>
|
|
|
- <Reference Include="GalaSoft.MvvmLight.WPF4, Version=3.0.0.32852, Culture=neutral, PublicKeyToken=63eb5c012e0b3c1c, processorArchitecture=MSIL">
|
|
|
- <SpecificVersion>False</SpecificVersion>
|
|
|
- <HintPath>..\packages\MvvmLight.3.0.3\lib\net40\GalaSoft.MvvmLight.WPF4.dll</HintPath>
|
|
|
- </Reference>
|
|
|
- <Reference Include="Microsoft.Practices.ServiceLocation">
|
|
|
- <SpecificVersion>False</SpecificVersion>
|
|
|
- <HintPath>C:\Program Files\Laurent Bugnion (GalaSoft)\Mvvm Light Toolkit\Binaries\WPF4\Microsoft.Practices.ServiceLocation.dll</HintPath>
|
|
|
- </Reference>
|
|
|
- <Reference Include="NLog">
|
|
|
- <HintPath>..\packages\NLog.2.0.0.0\lib\NET40\NLog.dll</HintPath>
|
|
|
- </Reference>
|
|
|
- <Reference Include="NLog.Extended">
|
|
|
- <HintPath>..\packages\NLog.2.0.0.0\lib\NET40\NLog.Extended.dll</HintPath>
|
|
|
- </Reference>
|
|
|
+ <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
|
|
+ <Reference Include="Microsoft.Practices.Prism.MefExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
|
|
<Reference Include="System" />
|
|
|
+ <Reference Include="System.ComponentModel.Composition" />
|
|
|
<Reference Include="System.Data" />
|
|
|
- <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
|
|
- <HintPath>..\packages\MvvmLight.3.0.3\lib\net40\System.Windows.Interactivity.dll</HintPath>
|
|
|
- </Reference>
|
|
|
<Reference Include="System.Xml" />
|
|
|
<Reference Include="Microsoft.CSharp" />
|
|
|
<Reference Include="System.Core" />
|
|
|
@@ -78,32 +58,18 @@
|
|
|
<Generator>MSBuild:Compile</Generator>
|
|
|
<SubType>Designer</SubType>
|
|
|
</ApplicationDefinition>
|
|
|
- <None Include="NLog.config">
|
|
|
- <SubType>Designer</SubType>
|
|
|
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
|
- </None>
|
|
|
- <Compile Include="Logical\LoginRealm.cs" />
|
|
|
- <Compile Include="Model\Main.cs" />
|
|
|
- <Compile Include="ViewModel\MainViewModel.cs" />
|
|
|
- <Compile Include="ViewModel\ViewModelLocator.cs" />
|
|
|
- <Compile Include="View\MainView.xaml.cs">
|
|
|
- <DependentUpon>MainView.xaml</DependentUpon>
|
|
|
+ <Compile Include="Bootstrapper.cs" />
|
|
|
+ <Compile Include="Shell.xaml.cs">
|
|
|
+ <DependentUpon>Shell.xaml</DependentUpon>
|
|
|
</Compile>
|
|
|
- <Page Include="MainWindow.xaml">
|
|
|
- <Generator>MSBuild:Compile</Generator>
|
|
|
- <SubType>Designer</SubType>
|
|
|
- </Page>
|
|
|
+ <Compile Include="ShellViewModel.cs" />
|
|
|
<Compile Include="App.xaml.cs">
|
|
|
<DependentUpon>App.xaml</DependentUpon>
|
|
|
<SubType>Code</SubType>
|
|
|
</Compile>
|
|
|
- <Compile Include="MainWindow.xaml.cs">
|
|
|
- <DependentUpon>MainWindow.xaml</DependentUpon>
|
|
|
- <SubType>Code</SubType>
|
|
|
- </Compile>
|
|
|
- <Page Include="View\MainView.xaml">
|
|
|
- <SubType>Designer</SubType>
|
|
|
+ <Page Include="Shell.xaml">
|
|
|
<Generator>MSBuild:Compile</Generator>
|
|
|
+ <SubType>Designer</SubType>
|
|
|
</Page>
|
|
|
</ItemGroup>
|
|
|
<ItemGroup>
|
|
|
@@ -113,15 +79,13 @@
|
|
|
<Folder Include="Properties\" />
|
|
|
</ItemGroup>
|
|
|
<ItemGroup>
|
|
|
- <ProjectReference Include="..\Thread\Thread.csproj">
|
|
|
- <Project>{01AE803B-71F3-4DD6-BEAA-6BA7C2D13E23}</Project>
|
|
|
- <Name>Thread</Name>
|
|
|
+ <ProjectReference Include="..\Modules\LoginModule\Login.csproj">
|
|
|
+ <Project>{7CC7BF9C-13BE-470E-BC35-6A1944767899}</Project>
|
|
|
+ <Name>Login</Name>
|
|
|
</ProjectReference>
|
|
|
</ItemGroup>
|
|
|
<ItemGroup>
|
|
|
- <None Include="Packages.config">
|
|
|
- <SubType>Designer</SubType>
|
|
|
- </None>
|
|
|
+ <None Include="NLog.config" />
|
|
|
</ItemGroup>
|
|
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|