Skip to content

Commit ddc26e7

Browse files
zivillianzivillian
authored
migrate to netstandard2.0 (#19)
- new csproj format - multi targeting netstandard2.0 & net461 (as suggested by Immo Landwerth) - moved tests to xunit
1 parent 7c68136 commit ddc26e7

16 files changed

+421
-778
lines changed

‎Graphite.Test/Graphite.Test.csproj‎

Lines changed: 18 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{C4EB3065-0684-4CC2-8327-3429C5DE9C16}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
5+
<IsPackable>false</IsPackable>
96
<RootNamespace>ahd.Graphite.Test</RootNamespace>
107
<AssemblyName>ahd.Graphite.Test</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
17-
<IsCodedUITest>False</IsCodedUITest>
18-
<TestProjectType>UnitTest</TestProjectType>
19-
<SccProjectName>SAK</SccProjectName>
20-
<SccLocalPath>SAK</SccLocalPath>
21-
<SccAuxPath>SAK</SccAuxPath>
22-
<SccProvider>SAK</SccProvider>
23-
<NuGetPackageImportStamp>
24-
</NuGetPackageImportStamp>
258
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
27-
<DebugSymbols>true</DebugSymbols>
28-
<DebugType>full</DebugType>
29-
<Optimize>false</Optimize>
30-
<OutputPath>bin\Debug\</OutputPath>
31-
<DefineConstants>DEBUG;TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3411
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
12+
<WarningsAsErrors />
3513
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37-
<DebugType>pdbonly</DebugType>
38-
<Optimize>true</Optimize>
39-
<OutputPath>bin\Release\</OutputPath>
40-
<DefineConstants>TRACE</DefineConstants>
41-
<ErrorReport>prompt</ErrorReport>
42-
<WarningLevel>4</WarningLevel>
43-
<RunCodeAnalysis>true</RunCodeAnalysis>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4416
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17+
<WarningsAsErrors />
4518
</PropertyGroup>
19+
4620
<ItemGroup>
47-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="Razorvine.Pyrolite, Version=4.16.0.37516, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Razorvine.Pyrolite.4.16.0\lib\net40\Razorvine.Pyrolite.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Razorvine.Serpent, Version=1.16.0.42115, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Razorvine.Serpent.1.16.0\lib\net40\Razorvine.Serpent.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="System" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
22+
<PackageReference Include="xunit" Version="2.3.1" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
6024
</ItemGroup>
61-
<Choose>
62-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
63-
<ItemGroup>
64-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
65-
</ItemGroup>
66-
</When>
67-
<Otherwise>
68-
<ItemGroup>
69-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
70-
</ItemGroup>
71-
</Otherwise>
72-
</Choose>
25+
7326
<ItemGroup>
74-
<Compile Include="GraphiteClientTest.cs" />
75-
<Compile Include="GraphiteFunctionsTest.cs" />
76-
<Compile Include="GraphitePathTest.cs" />
77-
<Compile Include="Properties\AssemblyInfo.cs" />
78-
<Compile Include="Properties\Settings.Designer.cs">
79-
<AutoGen>True</AutoGen>
80-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
81-
<DependentUpon>Settings.settings</DependentUpon>
82-
</Compile>
27+
<ProjectReference Include="..\Graphite\Graphite.csproj" />
8328
</ItemGroup>
84-
<ItemGroup>
85-
<ProjectReference Include="..\Graphite\Graphite.csproj">
86-
<Project>{05530EED-1658-4F66-8E42-796FF449AEA4}</Project>
87-
<Name>Graphite</Name>
88-
</ProjectReference>
89-
</ItemGroup>
90-
<ItemGroup>
91-
<None Include="app.config">
92-
<SubType>Designer</SubType>
93-
</None>
94-
<None Include="packages.config">
95-
<SubType>Designer</SubType>
96-
</None>
97-
<None Include="Properties\Settings.settings">
98-
<Generator>SettingsSingleFileGenerator</Generator>
99-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
100-
</None>
101-
</ItemGroup>
102-
<Choose>
103-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
104-
<ItemGroup>
105-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106-
<Private>False</Private>
107-
</Reference>
108-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109-
<Private>False</Private>
110-
</Reference>
111-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
112-
<Private>False</Private>
113-
</Reference>
114-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
115-
<Private>False</Private>
116-
</Reference>
117-
</ItemGroup>
118-
</When>
119-
</Choose>
120-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
121-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122-
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
123-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124-
<PropertyGroup>
125-
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
126-
</PropertyGroup>
127-
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
128-
</Target>
129-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
130-
Other similar extension points exist, see Microsoft.Common.targets.
131-
<Target Name="BeforeBuild">
132-
</Target>
133-
<Target Name="AfterBuild">
134-
</Target>
135-
-->
136-
</Project>
29+
30+
</Project>

0 commit comments

Comments
 (0)