Migrating to SDK 1.0.4

* `dotnet migrate` all the projects, moving from project.json to .csproj * Created a solution file (dotnet new sln and dotnet sln add ...) capturing all of the projects to replace the equivalent global.json * Adjusted *some* of the test run batch files to account for new CLI format for invoking unit tests * Had to make some adjustments to TestServer integration tests to handling binding redirects properly as described by aspnet/Hosting#959 and microsoft/vstest#428
zyborg · Jun 30, 2017 · 0b43118 · 0b43118
1 parent 2a0062c
commit 0b43118
Show file tree

Hide file tree

Showing 36 changed files with 1,094 additions and 899 deletions.
diff --git a/Zyborg-tug.sln b/Zyborg-tug.sln
diff --git a/global.json b/global.json
diff --git a/migrate-report.json b/migrate-report.json
@@ -0,0 +1,191 @@
+// Migration invoked at the console:
+//    dotnet migrate -r migrate-report.json --format-report-file-json
+//
+// Then after the migration:
+//    dotnet new sln
+//    dotnet sln add src\Tug.Base\Tug.Base.csproj
+//    dotnet sln add src\Tug.Client\Tug.Client.csproj
+//    dotnet sln add src\Tug.Server.Base\Tug.Server.Base.csproj
+//    dotnet sln add src\Tug.Server\Tug.Server.csproj
+//    dotnet sln add src\Tug.Server.Providers.Ps5DscHandler\Tug.Server.Providers.Ps5DscHandler.csproj
+//    dotnet sln add src\Tug.Server.FaaS.AwsLambda\Tug.Server.FaaS.AwsLambda.csproj
+//    dotnet sln add src\Tug.Ext-WORK\Tug.Ext-WORK.csproj
+//    dotnet sln add test\Tug.UnitTesting\Tug.UnitTesting.csproj
+//    dotnet sln add test\client\Tug.Client-tests\Tug.Client-tests.csproj
+//    dotnet sln add test\server\Tug.Server-itests\Tug.Server-itests.csproj
+//    dotnet sln add test\server\Tug.Server.FaaS.AwsLambda-tests\Tug.Server.FaaS.AwsLambda-tests.csproj
+//    dotnet sln add test\Tug.Ext-tests\Tug.Ext-tests.csproj
+//    dotnet sln add test\Tug.Ext-tests-aux\Tug.Ext-tests-aux.csproj
+//    dotnet sln add src\bundles\Tug.Server-ps5\Tug.Server-ps5.csproj
+
+{
+    "ProjectMigrationReports": [
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\bundles\\Tug.Server-ps5",
+            "ProjectName": "Tug.Server-ps5",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\bundles\\Tug.Server-ps5\\Tug.Server-ps5.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Base",
+            "ProjectName": "Tug.Base",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Base\\Tug.Base.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server",
+            "ProjectName": "Tug.Server",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server\\Tug.Server.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.Base",
+            "ProjectName": "Tug.Server.Base",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.Base\\Tug.Server.Base.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Client",
+            "ProjectName": "Tug.Client",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Client\\Tug.Client.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Ext-WORK",
+            "ProjectName": "Tug.Ext-WORK",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Ext-WORK\\Tug.Ext-WORK.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.FaaS.AwsLambda",
+            "ProjectName": "Tug.Server.FaaS.AwsLambda",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.FaaS.AwsLambda\\Tug.Server.FaaS.AwsLambda.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.Providers.Ps5DscHandler",
+            "ProjectName": "Tug.Server.Providers.Ps5DscHandler",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\src\\Tug.Server.Providers.Ps5DscHandler\\Tug.Server.Providers.Ps5DscHandler.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\client\\Tug.Client-tests",
+            "ProjectName": "Tug.Client-tests",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\client\\Tug.Client-tests\\Tug.Client-tests.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.UnitTesting",
+            "ProjectName": "Tug.UnitTesting",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.UnitTesting\\Tug.UnitTesting.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\server\\Tug.Server-itests",
+            "ProjectName": "Tug.Server-itests",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\server\\Tug.Server-itests\\Tug.Server-itests.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\server\\Tug.Server.FaaS.AwsLambda-tests",
+            "ProjectName": "Tug.Server.FaaS.AwsLambda-tests",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\server\\Tug.Server.FaaS.AwsLambda-tests\\Tug.Server.FaaS.AwsLambda-tests.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.Ext-tests",
+            "ProjectName": "Tug.Ext-tests",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.Ext-tests\\Tug.Ext-tests.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        },
+        {
+            "ProjectDirectory": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.Ext-tests-aux",
+            "ProjectName": "Tug.Ext-tests-aux",
+            "OutputMSBuildProject": "C:\\prj\\zyborg\\Zyborg-tug\\test\\Tug.Ext-tests-aux\\Tug.Ext-tests-aux.csproj",
+            "Errors": [],
+            "Warnings": [],
+            "PreExistingCsprojDependencies": [],
+            "Skipped": false,
+            "Failed": false,
+            "Succeeded": true
+        }
+    ],
+    "MigratedProjectsCount": 14,
+    "SucceededProjectsCount": 14,
+    "FailedProjectsCount": 0,
+    "AllSucceeded": true
+}
+
+// Written on the console:
+//    Summary
+//    Total Projects: 14
+//    Succeeded Projects: 14
+//    Failed Projects: 0
+//    
+//    The project migration has finished. Please visit https://aka.ms/coremigration to report any issues you've encountered or ask for help.
+//    Files backed up to C:\prj\zyborg\Zyborg-tug\backup\
diff --git a/src/Tug.Base/Tug.Base.csproj b/src/Tug.Base/Tug.Base.csproj
@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>github.com/PowerShellOrg/tug/graphs/contributors</Authors>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+    <NoWarn>$(NoWarn);CS0169;CS0649</NoWarn>
+    <DebugType>portable</DebugType>
+    <AssemblyName>Tug.Base</AssemblyName>
+    <PackageId>Tug.Base</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\shared\SharedAssemblyInfo.cs;..\shared\SharedAssemblyVersionInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Composition" Version="1.0.31" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <DefineConstants>$(DefineConstants);DOTNET_CORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <DefineConstants>$(DefineConstants);DOTNET_FRAMEWORK</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Tug.Base/project.json b/src/Tug.Base/project.json