use new proj

2017-07-05 16:37:42 -04:00
parent 526f7b04c8
commit 2011b935d9
15 changed files with 68 additions and 156 deletions
--- a/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs
+++ b/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs
@@ -5,10 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UriBuilder.Fluent.UnitTests")]
-[assembly: AssemblyTrademark("")]
+

 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
--- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj
+++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
+    <AssemblyName>UriBuilder.Fluent.UnitTests</AssemblyName>
+    <PackageId>UriBuilder.Fluent.UnitTests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\UriBuilder.Fluent\UriBuilder.Fluent.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
+    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
--- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj
+++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f421a9ee-180c-413e-a0cd-665295825646</ProjectGuid>
-    <RootNamespace>UriBuilder.Fluent.UnitTests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
--- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user
+++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>Start</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>
--- a/src/UriBuilder.Fluent.UnitTests/project.json
+++ b/src/UriBuilder.Fluent.UnitTests/project.json
@@ -1,22 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "testRunner": "xunit",
-
-  "dependencies": {
-    "xunit": "2.2.0-beta2-build3300",
-    "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "UriBuilder.Fluent": "1.0.0-*"
-  },
-
-  "frameworks": {
-    "net461":{},
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        }
-      }
-    }
-  }
-}
--- a/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs
+++ b/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs
@@ -5,10 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UriBuilder.Fluent")]
-[assembly: AssemblyTrademark("")]
+

 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
--- a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj
+++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Authors>Tommy Parnell</Authors>
+    <TargetFrameworks>netstandard1.1;net40;net45</TargetFrameworks>
+    <AssemblyName>UriBuilder.Fluent</AssemblyName>
+    <PackageId>UriBuilder.Fluent</PackageId>
+    <PackageTags>Url building;Uri;Uri building;fluent;extension</PackageTags>
+    <PackageProjectUrl>https://github.com/TerribleDev/UriBuilder.Fluent</PackageProjectUrl>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'net40' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
--- a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj
+++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b8458f59-debd-4844-aa29-ee3b4388aa7a</ProjectGuid>
-    <RootNamespace>UriBuilder.Fluent</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
--- a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user
+++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>Start</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>
--- a/src/UriBuilder.Fluent/project.json
+++ b/src/UriBuilder.Fluent/project.json
@@ -1,32 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "packOptions": {
-      "owners": [
-          "Tommy Parnell"
-      ],
-      "projectUrl": "https://github.com/TerribleDev/UriBuilder.Fluent",
-      "summary": "Fluent extensions for UriBuilder",
-      "tags": [
-          "Url building",
-          "Uri",
-          "Uri building",
-          "fluent",
-          "extension"
-      ]
-  },
-  "authors": [
-      "Tommy Parnell"
-  ],
-  "frameworks": {
-    "netstandard1.1": {
-      "imports": "dnxcore50",
-        "dependencies": {
-         "NETStandard.Library": "1.6.0"
-        }
-    },
-    "net40": {
-      "imports": "dnxcore50"
-    },
-    "net45":{}
-  }
-}