Skip to content

Commit 65e3c87

Browse files
committed
Now using .NET 4.6.2.
1 parent 7780f46 commit 65e3c87

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

ColorSetKit-Test/ColorSetKit-Test.csproj

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +9,7 @@
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>ColorSetKit_Test</RootNamespace>
1211
<AssemblyName>ColorSetKit-Test</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
1514
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1615
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -42,12 +41,6 @@
4241
<Prefer32Bit>false</Prefer32Bit>
4342
</PropertyGroup>
4443
<ItemGroup>
45-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
50-
</Reference>
5144
<Reference Include="PresentationCore" />
5245
<Reference Include="System" />
5346
<Reference Include="System.Core" />
@@ -58,25 +51,22 @@
5851
<Compile Include="Test.cs" />
5952
<Compile Include="Properties\AssemblyInfo.cs" />
6053
</ItemGroup>
61-
<ItemGroup>
62-
<None Include="packages.config" />
63-
</ItemGroup>
6454
<ItemGroup>
6555
<ProjectReference Include="..\ColorSetKit\ColorSetKit.csproj">
6656
<Project>{e3bf32cb-99e2-4331-afb6-9281d79e63bc}</Project>
6757
<Name>ColorSetKit</Name>
6858
</ProjectReference>
6959
</ItemGroup>
60+
<ItemGroup>
61+
<PackageReference Include="MSTest.TestAdapter">
62+
<Version>1.3.2</Version>
63+
</PackageReference>
64+
<PackageReference Include="MSTest.TestFramework">
65+
<Version>1.3.2</Version>
66+
</PackageReference>
67+
</ItemGroup>
7068
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
7169
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73-
<PropertyGroup>
74-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
75-
</PropertyGroup>
76-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
77-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
78-
</Target>
79-
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
8070
<PropertyGroup>
8171
<PostBuildEvent>copy "$(ProjectDir)Colors.colorset" "$(TargetDir)Colors.colorset"
8272
copy "$(ProjectDir)Colors-XML.colorset" "$(TargetDir)Colors-XML.colorset"</PostBuildEvent>

ColorSetKit-Test/packages.config

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

ColorSetKit/ColorSetKit.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ColorSetKit</RootNamespace>
1111
<AssemblyName>ColorSetKit</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+
<TargetFrameworkProfile>
16+
</TargetFrameworkProfile>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
2223
<DefineConstants>DEBUG;TRACE</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2729
<DebugType>pdbonly</DebugType>
@@ -30,6 +32,7 @@
3032
<DefineConstants>TRACE</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<ItemGroup>
3538
<Reference Include="PresentationCore" />

0 commit comments

Comments
 (0)