Skip to content

Commit 4e29d8e

Browse files
authored
Merge pull request #1 from ShahJe/master
Converted projects to .Net Core and targets netcoreapp2.1, netstandard2.0 and net461.
2 parents 52453d7 + 7cbf866 commit 4e29d8e

File tree

11 files changed

+509
-787
lines changed

11 files changed

+509
-787
lines changed

src/TableStorage.Abstractions.Trie.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 14 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{E832F4FF-0675-4127-82D5-BC4C8F626D00}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>TableStorage.Abstractions.Trie.Tests</RootNamespace>
11-
<AssemblyName>TableStorage.Abstractions.Trie.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
16-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
17-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
18-
<IsCodedUITest>False</IsCodedUITest>
19-
<TestProjectType>UnitTest</TestProjectType>
20-
<NuGetPackageImportStamp>
21-
</NuGetPackageImportStamp>
22-
<TargetFrameworkProfile />
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
237
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25-
<DebugSymbols>true</DebugSymbols>
26-
<DebugType>full</DebugType>
27-
<Optimize>false</Optimize>
28-
<OutputPath>bin\Debug\</OutputPath>
29-
<DefineConstants>DEBUG;TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34-
<DebugType>pdbonly</DebugType>
35-
<Optimize>true</Optimize>
36-
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE</DefineConstants>
38-
<ErrorReport>prompt</ErrorReport>
39-
<WarningLevel>4</WarningLevel>
40-
</PropertyGroup>
41-
<ItemGroup>
42-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
43-
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
50-
</Reference>
51-
<Reference Include="System" />
52-
<Reference Include="System.Core" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<Compile Include="Customer.cs" />
56-
<Compile Include="TrieTests.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
</ItemGroup>
8+
599
<ItemGroup>
60-
<None Include="app.config" />
61-
<None Include="packages.config" />
10+
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
11+
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
12+
<PackageReference Include="nunit" Version="3.10.1" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
6215
</ItemGroup>
16+
6317
<ItemGroup>
64-
<ProjectReference Include="..\TableStorage.Abstractions.Trie\TableStorage.Abstractions.Trie.csproj">
65-
<Project>{b9971183-de4c-4eda-8e7e-e7ab0c634724}</Project>
66-
<Name>TableStorage.Abstractions.Trie</Name>
67-
</ProjectReference>
18+
<ProjectReference Include="..\TableStorage.Abstractions.Trie\TableStorage.Abstractions.Trie.csproj" />
6819
</ItemGroup>
69-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
70-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
71-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
72-
<PropertyGroup>
73-
<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>
74-
</PropertyGroup>
75-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
76-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
77-
</Target>
78-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
20+
7921
</Project>

0 commit comments

Comments
 (0)