Skip to content

Commit

Permalink
Using Package Reference in Client.Launcher
Browse files Browse the repository at this point in the history
  • Loading branch information
@godrose
godrose committed Feb 21, 2018
1 parent 32b5ae3 commit 8603d82
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 135 deletions.
2 changes: 1 addition & 1 deletion Samples.Client.Model/Samples.Client.Model.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWithFake|AnyCPU'">
<OutputPath>..\Bin\IntegrationWithFake\</OutputPath>
<OutputPath>..\Bin\DebugWithFake\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='IntegrationWithFake|AnyCPU'">
Expand Down
4 changes: 3 additions & 1 deletion Samples.Specifications.Client.Launcher/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using LogoFX.Client.Bootstrapping;
using System.IO;
using System.Reflection;
using LogoFX.Client.Bootstrapping;
using LogoFX.Client.Mvvm.Commanding;
using Samples.Specifications.Client.Launcher.Shared;

Expand Down
121 changes: 18 additions & 103 deletions Samples.Specifications.Client.Launcher/Samples.Specifications.Client.Launcher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWithReal|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\bin\DebugWithReal\</OutputPath>
Expand All @@ -81,110 +85,10 @@
<OutputPath>..\Bin\IntegrationWithFake\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="Caliburn.Micro, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.Core.4.0.0-alpha.1\lib\netstandard1.0\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="Caliburn.Micro.Platform, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.4.0.0-alpha.1\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
<Reference Include="Caliburn.Micro.Platform.Core, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.4.0.0-alpha.1\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Bootstrapping, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Bootstrapping.1.7.1-rc4\lib\netstandard2.0\LogoFX.Bootstrapping.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Bootstrapping.Middleware, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Bootstrapping.1.7.1-rc4\lib\netstandard2.0\LogoFX.Bootstrapping.Middleware.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Bootstrapping, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Bootstrapping.Core.1.7.1-rc2\lib\netstandard2.0\LogoFX.Client.Bootstrapping.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Bootstrapping.Adapters.Contracts, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Bootstrapping.Adapters.Contracts.1.1.1-rc2\lib\netstandard2.0\LogoFX.Client.Bootstrapping.Adapters.Contracts.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Bootstrapping.Adapters.SimpleContainer.1.2.1-rc2\lib\netstandard2.0\LogoFX.Client.Bootstrapping.Adapters.SimpleContainer.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Bootstrapping.Platform, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Bootstrapping.1.7.1-rc4\lib\net461\LogoFX.Client.Bootstrapping.Platform.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Core.Core.1.2.1-rc2\lib\netstandard2.0\LogoFX.Client.Core.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Core.Platform, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Core.1.2.1-rc3\lib\net461\LogoFX.Client.Core.Platform.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Mvvm.Commanding, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Mvvm.Commanding.Core.1.1.1-rc3\lib\netstandard2.0\LogoFX.Client.Mvvm.Commanding.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Mvvm.Commanding.Platform, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Mvvm.Commanding.1.1.1-rc3\lib\net461\LogoFX.Client.Mvvm.Commanding.Platform.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Client.Mvvm.Core.Platform, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Client.Mvvm.Core.1.1.1-rc2\lib\net461\LogoFX.Client.Mvvm.Core.Platform.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Core, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Core.1.1.1-rc2\lib\netstandard2.0\LogoFX.Core.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Practices.IoC, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Practices.IoC.1.1.1-rc2\lib\netstandard2.0\LogoFX.Practices.IoC.dll</HintPath>
</Reference>
<Reference Include="LogoFX.Practices.IoC.Modularity, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LogoFX.Practices.IoC.1.1.1-rc2\lib\netstandard2.0\LogoFX.Practices.IoC.Modularity.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Solid.Bootstrapping, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Bootstrapping.1.2.1-rc3\lib\netstandard2.0\Solid.Bootstrapping.dll</HintPath>
</Reference>
<Reference Include="Solid.Extensibility, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Extensibility.1.2.1-rc2\lib\netstandard2.0\Solid.Extensibility.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Composition, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Composition.Core.1.2.1-rc4\lib\netstandard2.0\Solid.Practices.Composition.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Composition.Client, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Composition.Client.1.2.1-rc3\lib\netstandard2.0\Solid.Practices.Composition.Client.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Composition.Container, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Composition.Core.1.2.1-rc4\lib\netstandard2.0\Solid.Practices.Composition.Container.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Composition.Contracts, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Composition.Core.1.2.1-rc4\lib\netstandard2.0\Solid.Practices.Composition.Contracts.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Composition.Platform, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Composition.1.2.1-rc3\lib\net461\Solid.Practices.Composition.Platform.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.IoC, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.IoC.1.2.1-rc4\lib\netstandard2.0\Solid.Practices.IoC.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Middleware, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Middleware.1.2.1-rc2\lib\netstandard2.0\Solid.Practices.Middleware.dll</HintPath>
</Reference>
<Reference Include="Solid.Practices.Modularity, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Solid.Practices.Modularity.1.2.1-rc2\lib\netstandard2.0\Solid.Practices.Modularity.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0-preview00001\lib\net46\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Core.4.0.0-preview00001\lib\net46\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Interfaces.4.0.0-preview00001\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Linq.4.0.0-preview00001\lib\net46\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.4.0.0-alpha.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand All @@ -202,9 +106,6 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
Expand Down Expand Up @@ -234,6 +135,20 @@
<Name>Samples.Specifications.Client.Presentation.Shell</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper">
<Version>6.1.1</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Bootstrapping">
<Version>1.7.1-rc4</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer">
<Version>1.2.1-rc2</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding">
<Version>1.1.1-rc3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
30 changes: 0 additions & 30 deletions Samples.Specifications.Client.Launcher/packages.config
View file

This file was deleted.

0 comments on commit 8603d82

Please sign in to comment.