Migrate to .Net Core.

HarelM · Mar 12, 2017 · 435ae83 · 435ae83
1 parent 2db86ab
commit 435ae83
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 265 deletions.
diff --git a/IsraelTransverseMercator.Tests/IsraelTransverseMercator.Tests.csproj b/IsraelTransverseMercator.Tests/IsraelTransverseMercator.Tests.csproj
@@ -1,100 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{694F4AE2-C774-4FA0-A419-01C2A81D3446}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IsraelTransverseMercator.Tests</RootNamespace>
-    <AssemblyName>IsraelTransverseMercator.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.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>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>    
+    <TargetFramework>netcoreapp1.1</TargetFramework>
   </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="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ProjNet, Version=1.3.2.0, Culture=neutral, PublicKeyToken=a1f5bdcd9c6f5740, processorArchitecture=MSIL">
-      <HintPath>..\packages\ProjNET4GeoAPI.1.3.2-pre1\lib\net45-client\ProjNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+
   <ItemGroup>
-    <Compile Include="ItmWgs84MathTransfromTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\IsraelTransverseMercator\IsraelTransverseMercator.csproj">
-      <Project>{92a12062-6cf7-47b1-a3b9-d1ed53e12739}</Project>
-      <Name>IsraelTransverseMercator</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\IsraelTransverseMercator\IsraelTransverseMercator.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/IsraelTransverseMercator.Tests/Properties/AssemblyInfo.cs b/IsraelTransverseMercator.Tests/Properties/AssemblyInfo.cs
diff --git a/IsraelTransverseMercator.Tests/app.config b/IsraelTransverseMercator.Tests/app.config
diff --git a/IsraelTransverseMercator.Tests/packages.config b/IsraelTransverseMercator.Tests/packages.config
diff --git a/IsraelTransverseMercator.nuspec b/IsraelTransverseMercator.nuspec
diff --git a/IsraelTransverseMercator.sln b/IsraelTransverseMercator.sln
@@ -1,15 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsraelTransverseMercator", "IsraelTransverseMercator\IsraelTransverseMercator.csproj", "{92A12062-6CF7-47B1-A3B9-D1ED53E12739}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsraelTransverseMercator", "IsraelTransverseMercator\IsraelTransverseMercator.csproj", "{334901A0-1B7F-48B0-86BC-C95A8B84A20C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsraelTransverseMercator.Tests", "IsraelTransverseMercator.Tests\IsraelTransverseMercator.Tests.csproj", "{694F4AE2-C774-4FA0-A419-01C2A81D3446}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsraelTransverseMercator.Tests", "IsraelTransverseMercator.Tests\IsraelTransverseMercator.Tests.csproj", "{D383053B-B89B-470D-A667-3590718D1E74}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD696A7A-B001-4C93-AE0A-3FDBCB071600}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3038257-D8C4-4423-B0D5-FC284340CC55}"
 	ProjectSection(SolutionItems) = preProject
-		IsraelTransverseMercator.nuspec = IsraelTransverseMercator.nuspec
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -19,14 +18,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92A12062-6CF7-47B1-A3B9-D1ED53E12739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92A12062-6CF7-47B1-A3B9-D1ED53E12739}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92A12062-6CF7-47B1-A3B9-D1ED53E12739}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92A12062-6CF7-47B1-A3B9-D1ED53E12739}.Release|Any CPU.Build.0 = Release|Any CPU
-		{694F4AE2-C774-4FA0-A419-01C2A81D3446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{694F4AE2-C774-4FA0-A419-01C2A81D3446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{694F4AE2-C774-4FA0-A419-01C2A81D3446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{694F4AE2-C774-4FA0-A419-01C2A81D3446}.Release|Any CPU.Build.0 = Release|Any CPU
+		{334901A0-1B7F-48B0-86BC-C95A8B84A20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{334901A0-1B7F-48B0-86BC-C95A8B84A20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{334901A0-1B7F-48B0-86BC-C95A8B84A20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{334901A0-1B7F-48B0-86BC-C95A8B84A20C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D383053B-B89B-470D-A667-3590718D1E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D383053B-B89B-470D-A667-3590718D1E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D383053B-B89B-470D-A667-3590718D1E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D383053B-B89B-470D-A667-3590718D1E74}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/IsraelTransverseMercator/IsraelTransverseMercator.csproj b/IsraelTransverseMercator/IsraelTransverseMercator.csproj
@@ -1,60 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{92A12062-6CF7-47B1-A3B9-D1ED53E12739}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IsraelTransverseMercator</RootNamespace>
-    <AssemblyName>IsraelTransverseMercator</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Version>2.2.2-pre1</Version>
+    <Authors>Harel Mazor</Authors>
+    <Company>Harel Mazor Consulting</Company>
+    <Product>Israel Transverse Mercator</Product>
+    <Description>An Israel Transverse Mercator math transfrom</Description>
+    <Copyright>Copyright 2017</Copyright>
+    <PackageTags>ITM Israel Transverse Mercator New Grid WGS84</PackageTags>
+    <PackageLicenseUrl>https://github.com/HarelM/IsraelTransverseMercator/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/HarelM/IsraelTransverseMercator</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/HarelM/IsraelTransverseMercator</RepositoryUrl>
+    <RepositoryType>Open Source</RepositoryType>
+    <PackageReleaseNotes>.Net Core support</PackageReleaseNotes>
   </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>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\IsraelTransverseMercator.xml</DocumentationFile>
+    <OutputPath></OutputPath>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="ItmWgs84MathTransfrom.cs" />
-    <Compile Include="Datum.cs" />
-    <Compile Include="Grid.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\packages\GeoAPI.1.7.4\lib\portable-net403+sl5+netcore45+wpa81+wp8+MonoAndroid10+XamariniOS10+MonoTouch10\GeoAPI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="GeoAPI" Version="1.7.5-pre3" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/IsraelTransverseMercator/Properties/AssemblyInfo.cs b/IsraelTransverseMercator/Properties/AssemblyInfo.cs
diff --git a/IsraelTransverseMercator/packages.config b/IsraelTransverseMercator/packages.config