jsuarezruiz
/
Portable.Xaml
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use PackageReference for everything

This commit is contained in:
Curtis Wensley 2018-01-20 20:21:55 -08:00
Родитель fd1ddc923b
Коммит 9db35ce769
7 изменённых файлов: 31 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Directory.Build.props
Просмотреть файл

@ -4,9 +4,9 @@
<BasePath>$(MSBuildThisFileDirectory)</BasePath>
<BaseIntermediateOutputPath>$(BasePath)artifacts\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<!-- RestoreProjectStyle will be supported in VS for Mac 7.4 -->
<!--RestoreProjectStyle Condition="'$(RestoreProjectStyle)' == '' AND $(UsePackagesConfig) != 'True'">PackageReference</RestoreProjectStyle-->
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Deterministic>False</Deterministic>
<RestoreProjectStyle Condition="'$(RestoreProjectStyle)' == '' AND $(UsePackagesConfig) != 'True'">PackageReference</RestoreProjectStyle>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Deterministic>False</Deterministic>
</PropertyGroup>
<Import Condition="Exists('$(MSBuildThisFileDirectory)..\Portable.Xaml.Common.props')" Project="$(MSBuildThisFileDirectory)..\Portable.Xaml.Common.props" />
</Project>

2
NuGet.Config
Просмотреть файл

@ -1,5 +1,5 @@
<configuration>
<config>
<add key="repositoryPath" value="artifacts/packages" />
<add key="repositoryPath" value="artifacts\packages" />
</config>
</configuration>

5
src/Portable.Xaml/Portable.Xaml-pcl259.csproj
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,6 +10,7 @@
<AssemblyName>Portable.Xaml</AssemblyName>
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -31,7 +32,6 @@
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<ItemGroup>
<Compile Include="Helpers\MemberExpressionExtensions.cs" />
<Compile Include="Helpers\ReflectionHelpers.cs" />
@ -181,4 +181,5 @@
<ItemGroup>
<EmbeddedResource Include="Compat.snk" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
</Project>

15
src/Test/Portable.Xaml-tests-net_4_5.csproj
Просмотреть файл

@ -90,17 +90,18 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="nunit.framework">
<HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="XmlFiles\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit">
<Version>3.9.0</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>1.4.0</Version>
</PackageReference>
</ItemGroup>
</Project>

15
src/Test/Portable.Xaml-tests-netstandard1.3.csproj
Просмотреть файл

@ -89,18 +89,11 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
<HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="XmlFiles\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Portable.Xaml\Portable.Xaml-netstandard1.3.csproj">
@ -108,4 +101,12 @@
<Name>Portable.Xaml-netstandard1.3</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit">
<Version>3.9.0</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>1.4.0</Version>
</PackageReference>
</ItemGroup>
</Project>

15
src/Test/Portable.Xaml-tests-pcl259.csproj
Просмотреть файл

@ -82,18 +82,11 @@
<Reference Include="System.Xml" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="nunit.framework">
<HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="XmlFiles\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Portable.Xaml\Portable.Xaml-pcl259.csproj">
@ -101,4 +94,12 @@
<Name>Portable.Xaml-pcl259</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit">
<Version>3.9.0</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>1.4.0</Version>
</PackageReference>
</ItemGroup>
</Project>

5
src/Test/packages.config
Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.9.0" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
</packages>