Skip to content

Commit

Permalink
Converted all projects to sdk style.
Browse files Browse the repository at this point in the history
Upgraded System.Reactive & related packages to 4.2.0.
Upgraded projects to either net core 3.0/3.1 and/or net 4.7.2.
  • Loading branch information
Gitii committed Dec 30, 2019
1 parent c813acf commit 91b0c9e
Show file tree
Hide file tree
Showing 25 changed files with 314 additions and 1,797 deletions.
105 changes: 17 additions & 88 deletions CalculatorTests/CalculatorTests.csproj
Original file line number Diff line number Diff line change
@@ -1,94 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4E865ACD-3075-42DA-9AAA-4EB431FBEA44}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CalculatorTests</RootNamespace>
<AssemblyName>CalculatorTests</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="NetworkValidationTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ExampleCalculatorApp\ExampleCalculatorApp.csproj">
<Project>{08f0c444-e608-4c6b-8514-691ab7416b55}</Project>
<Name>ExampleCalculatorApp</Name>
</ProjectReference>
<ProjectReference Include="..\NodeNetworkToolkit\NodeNetworkToolkit.csproj">
<Project>{391d0670-646f-4633-9e86-e9a966f61953}</Project>
<Name>NodeNetworkToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\NodeNetwork\NodeNetwork.csproj">
<Project>{96E1761E-AE02-48E9-95E8-4A3B2FC32025}</Project>
<Name>NodeNetwork</Name>
</ProjectReference>
<PackageReference Include="DynamicData" Version="6.13.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DynamicData">
<Version>6.13.9</Version>
</PackageReference>
<PackageReference Include="Microsoft.Reactive.Testing">
<Version>4.1.6</Version>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter">
<Version>1.4.0</Version>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>1.4.0</Version>
</PackageReference>
<PackageReference Include="ReactiveUI.Testing">
<Version>10.3.6</Version>
</PackageReference>
<PackageReference Include="System.Reactive">
<Version>4.1.6</Version>
</PackageReference>
<ProjectReference Include="..\ExampleCalculatorApp\ExampleCalculatorApp.csproj" />
<ProjectReference Include="..\NodeNetworkToolkit\NodeNetworkToolkit.csproj" />
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
20 changes: 0 additions & 20 deletions CalculatorTests/Properties/AssemblyInfo.cs

This file was deleted.

23 changes: 0 additions & 23 deletions CalculatorTests/app.config

This file was deleted.

46 changes: 0 additions & 46 deletions ExampleCalculatorApp/App.config

This file was deleted.

Loading

0 comments on commit 91b0c9e

Please sign in to comment.