Convert projects to use new project system (#6)

jeffkl · Sep 7, 2017 · 8ef3ecb · 8ef3ecb
1 parent 610ab8b
commit 8ef3ecb
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 119 deletions.
diff --git a/global.json b/global.json
diff --git a/src/MSBuildArgs.sln b/src/MSBuildArgs.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26828.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Build.CommandLine.Arguments", "Microsoft.Build.CommandLine.Arguments\Microsoft.Build.CommandLine.Arguments.xproj", "{2574A969-934C-439F-BBC0-6D46F7CE1FFA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.CommandLine.Arguments", "Microsoft.Build.CommandLine.Arguments\Microsoft.Build.CommandLine.Arguments.csproj", "{2574A969-934C-439F-BBC0-6D46F7CE1FFA}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Build.CommandLine.Arguments.UnitTests", "Microsoft.Build.CommandLine.Arguments.UnitTests\Microsoft.Build.CommandLine.Arguments.UnitTests.xproj", "{510FC774-5E9C-4B55-A015-0C2A7F55861A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.CommandLine.Arguments.UnitTests", "Microsoft.Build.CommandLine.Arguments.UnitTests\Microsoft.Build.CommandLine.Arguments.UnitTests.csproj", "{510FC774-5E9C-4B55-A015-0C2A7F55861A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {24582A1B-DD26-4B8F-BAEC-922FB6DA8ECC}
+	EndGlobalSection
 EndGlobal
diff --git a/...ld.CommandLine.Arguments.UnitTests/Microsoft.Build.CommandLine.Arguments.UnitTests.csproj b/...ld.CommandLine.Arguments.UnitTests/Microsoft.Build.CommandLine.Arguments.UnitTests.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="Shouldly" Version="2.8.2" />
+
+    <ProjectReference Include="..\Microsoft.Build.CommandLine.Arguments\Microsoft.Build.CommandLine.Arguments.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...ild.CommandLine.Arguments.UnitTests/Microsoft.Build.CommandLine.Arguments.UnitTests.xproj b/...ild.CommandLine.Arguments.UnitTests/Microsoft.Build.CommandLine.Arguments.UnitTests.xproj
diff --git a/src/Microsoft.Build.CommandLine.Arguments.UnitTests/Properties/AssemblyInfo.cs b/src/Microsoft.Build.CommandLine.Arguments.UnitTests/Properties/AssemblyInfo.cs
@@ -1,13 +1 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#if DEBUG
-
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.Build.CommandLine.Arguments")]
-[assembly: ComVisible(false)]
+
diff --git a/src/Microsoft.Build.CommandLine.Arguments.UnitTests/project.json b/src/Microsoft.Build.CommandLine.Arguments.UnitTests/project.json
diff --git a/src/Microsoft.Build.CommandLine.Arguments/Microsoft.Build.CommandLine.Arguments.csproj b/src/Microsoft.Build.CommandLine.Arguments/Microsoft.Build.CommandLine.Arguments.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
+
+    <Description>A class library for generating an MSBuild command-line</Description>
+    <AssemblyTitle>MSBuild Command-line Argument Builder</AssemblyTitle>
+    <VersionPrefix>1.0.0-beta</VersionPrefix>
+    <Authors>jeffkl</Authors>
+    <AssemblyName>Microsoft.Build.CommandLine.Arguments</AssemblyName>
+    <PackageId>Microsoft.Build.CommandLine.Arguments</PackageId>
+    <PackageTags>MSBuild;command;line;builder</PackageTags>
+    <PackageLicenseUrl>https://github.com/jeffkl/MSBuildArgs/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/jeffkl/MSBuildArgs</RepositoryUrl>
+
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
+  </ItemGroup>
+
+  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="NETStandard.Library" Version="1.6.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.262-preview5" />
+  </ItemGroup>-->
+
+  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>-->
+
+</Project>
diff --git a/src/Microsoft.Build.CommandLine.Arguments/Microsoft.Build.CommandLine.Arguments.xproj b/src/Microsoft.Build.CommandLine.Arguments/Microsoft.Build.CommandLine.Arguments.xproj
diff --git a/src/Microsoft.Build.CommandLine.Arguments/Properties/AssemblyInfo.cs b/src/Microsoft.Build.CommandLine.Arguments/Properties/AssemblyInfo.cs
@@ -1,10 +1,4 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-[assembly: AssemblyProduct("Microsoft.Build.CommandLine.Arguments")]
 [assembly: ComVisible(false)]
diff --git a/src/Microsoft.Build.CommandLine.Arguments/project.json b/src/Microsoft.Build.CommandLine.Arguments/project.json