Skip to content

Commit

Permalink
Revert "Revert "Migrate sdk104""
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebekker
ebekker authored Oct 25, 2017
1 parent cd53db4 commit da90e6a
Show file tree
Hide file tree
Showing 38 changed files with 1,103 additions and 893 deletions.
245 changes: 245 additions & 0 deletions Zyborg-tug.sln
View file

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions global.json
View file

This file was deleted.

191 changes: 191 additions & 0 deletions migrate-report.json
View file
Original file line number Diff line number Diff line change
@@ -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\
57 changes: 57 additions & 0 deletions src/Tug.Base/Tug.Base.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
70 changes: 0 additions & 70 deletions src/Tug.Base/project.json
View file

This file was deleted.

66 changes: 66 additions & 0 deletions src/Tug.Client/Tug.Client.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<NeutralLanguage>en-US</NeutralLanguage>
<Authors>github.com/PowerShellOrg/tug/graphs/contributors</Authors>
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
<NoWarn>$(NoWarn);CS0169;CS0649</NoWarn>
<DebugType>portable</DebugType>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Tug.Client</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>Tug.Client</PackageId>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.2</RuntimeFrameworkVersion>
<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>
<ProjectReference Include="..\Tug.Base\Tug.Base.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-beta5" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<DefineConstants>$(DefineConstants);DOTNET_CORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
<DefineConstants>$(DefineConstants);DOTNET_FRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
Loading

0 comments on commit da90e6a

Please sign in to comment.