diff --git a/global.json b/global.json deleted file mode 100644 index c9e1fdd..0000000 --- a/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "projects": [ - "src", - "test" - ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} \ No newline at end of file diff --git a/migrate-report.out b/migrate-report.out new file mode 100644 index 0000000..baac894 --- /dev/null +++ b/migrate-report.out @@ -0,0 +1,28 @@ + +Project Tug.Base migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Base). + +Project Tug.Client migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Client). + +Project Tug.Ext-WORK migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Ext-WORK). + +Project Tug.Server migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Server). + +Project Tug.Server.Base migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Server.Base). + +Project Tug.Server.FaaS.AwsLambda migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Server.FaaS.AwsLambda). + +Project Tug.Server.Providers.Ps5DscHandler migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Server.Providers.Ps5DscHandler). + +Project Tug.Ext-tests migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\test\Tug.Ext-tests). + +Project Tug.Ext-tests-aux migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\test\Tug.Ext-tests-aux). + +Project Tug.UnitTesting migration succeeded (C:\prj\zyborg\PowerShell-tug\tug\test\Tug.UnitTesting). +Summary +Total Projects: 10 +Succeeded Projects: 10 +Failed Projects: 0 + +##BEK: Also outputted: +# 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\PowerShell-tug\tug\backup\ \ No newline at end of file diff --git a/migrate.cmd b/migrate.cmd new file mode 100644 index 0000000..fbeb7b3 --- /dev/null +++ b/migrate.cmd @@ -0,0 +1,29 @@ +@REM +@REM C:\prj\zyborg\PowerShell-tug\tug\src\Tug.Client>dotnet migrate --help +@REM .NET Migrate Command +@REM +@REM Usage: dotnet migrate [arguments] [options] +@REM +@REM Arguments: +@REM The path to one of the following: +@REM - a project.json file to migrate. +@REM - a global.json file, it will migrate the folders specified in global.json. +@REM - a solution.sln file, it will migrate the projects referenced in the solution. +@REM - a directory to migrate, it will recursively search for project.json files to migrate. +@REM Defaults to current directory if nothing is specified. +@REM +@REM Options: +@REM -h|--help Show help information +@REM -t|--template-file Base MSBuild template to use for migrated app. The default is the project included in dotnet new. +@REM -v|--sdk-package-version The version of the sdk package that will be referenced in the migrated app. The default is the version of the sdk in dotnet new. +@REM -x|--xproj-file The path to the xproj file to use. Required when there is more than one xproj in a project directory. +@REM -s|--skip-project-references Skip migrating project references. By default project references are migrated recursively. +@REM -r|--report-file Output migration report to the given file in addition to the console. +@REM --format-report-file-json Output migration report file as json rather than user messages. +@REM --skip-backup Skip moving project.json, global.json, and *.xproj to a `backup` directory after successful migration. +@REM + +@SETLOCAL +@SET THIS_DIR=%~dp0 + +dotnet migrate "%THIS_DIR%global.json" --report-file "%THIS_DIR%migrate-report.out" \ No newline at end of file diff --git a/src/Tug.Base/Tug.Base.csproj b/src/Tug.Base/Tug.Base.csproj new file mode 100644 index 0000000..61b7777 --- /dev/null +++ b/src/Tug.Base/Tug.Base.csproj @@ -0,0 +1,44 @@ + + + + + + + netstandard1.6;net452 + + Tug.Base + Tug.Base + $(PackageTargetFallback);portable-net45+win8 + 1.6.1 + + + + + + + + + + + + + + $(DefineConstants);DOTNET_CORE + + + + + + + + + $(DefineConstants);DOTNET_FRAMEWORK + + + + + + + + + diff --git a/src/Tug.Base/project.json b/src/Tug.Base/project.json deleted file mode 100644 index 04024c5..0000000 --- a/src/Tug.Base/project.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - }, - - "dependencies": { - "Microsoft.Composition": "1.0.30", - "Microsoft.Extensions.PlatformAbstractions": "1.1.0", - "Microsoft.Extensions.DependencyModel": "1.1.0", - - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Configuration": "1.1.0", - - "Microsoft.AspNetCore.Mvc": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "buildOptions": { - "define": [ - "DOTNET_CORE" - ] - }, - "imports": [ - "portable-net45+win8" // Needed to include MEF2 - ], - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Runtime.Loader": "4.3.0", - "System.ComponentModel.Annotations": "4.3.0" - } - } - , - "net452": { - "buildOptions": { - "define": [ - "DOTNET_FRAMEWORK" - ] - }, - "frameworkAssemblies": { - // These are needed here as per: - // https://github.com/dotnet/cli/issues/3817 - "System.Numerics": "4.0.0.0", - "System.ComponentModel.DataAnnotations": "4.0.0.0" - }, - "dependencies": { - } - } - } -} diff --git a/src/Tug.Client/Tug.Client.csproj b/src/Tug.Client/Tug.Client.csproj new file mode 100644 index 0000000..c25aa0a --- /dev/null +++ b/src/Tug.Client/Tug.Client.csproj @@ -0,0 +1,66 @@ + + + + en-US + github.com/PowerShellOrg/tug/graphs/contributors + netcoreapp1.0;net452 + $(NoWarn);CS0169;CS0649 + portable + true + Tug.Client + Exe + Tug.Client + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + false + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);DOTNET_CORE + + + + $(DefineConstants);DOTNET_FRAMEWORK + + + + + + + + diff --git a/src/Tug.Client/project.json b/src/Tug.Client/project.json deleted file mode 100644 index dd74ea1..0000000 --- a/src/Tug.Client/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "preserveCompilationContext": true, - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - }, - - "dependencies": { - "Microsoft.Extensions.Logging.Console": "1.1.0", - "NLog.Extensions.Logging": "1.0.0-rtm-alpha5", - "Microsoft.Extensions.CommandLineUtils": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Configuration.Binder": "1.1.0", - - "Newtonsoft.Json": "9.0.1", - - "Tug.Base": { - "target": "project" - } - }, - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ - "DOTNET_CORE" - ] - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" // Needed to include MEF2 - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - - // For System.Net.WebProxy and others - "System.Net.Primitives": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.NetworkInformation": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0" - } - }, - "net452": { - "buildOptions": { - "define": [ - "DOTNET_FRAMEWORK" - ] - }, - "dependencies": { - - } - } - } -} diff --git a/src/Tug.Ext-WORK/Tug.Ext-WORK.csproj b/src/Tug.Ext-WORK/Tug.Ext-WORK.csproj new file mode 100644 index 0000000..8a086fd --- /dev/null +++ b/src/Tug.Ext-WORK/Tug.Ext-WORK.csproj @@ -0,0 +1,32 @@ + + + + Copyright © 2016 The DevOps Collective, Inc. All rights reserved. Licnesed under GNU GPL v3. + Tug Client + en-US + 0.5.1 + netcoreapp1.1;net462 + portable + true + Tug.Ext + Exe + Tug.Ext-WORK + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + + + + + + + + + + + + + + + + + diff --git a/src/Tug.Ext-WORK/project.json b/src/Tug.Ext-WORK/project.json deleted file mode 100644 index 22d4e1f..0000000 --- a/src/Tug.Ext-WORK/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "Tug.Ext", // WORK-IN-PROGRES for Extension/Provider model - "version": "0.5.1-*", - "copyright": "Copyright © 2016 The DevOps Collective, Inc. All rights reserved. Licnesed under GNU GPL v3.", - "title": "Tug Client", - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "dependencies": { - "System.Runtime.Loader": "4.3.0", - "Microsoft.Composition": "1.0.30", - - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Configuration": "1.0.0" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" // Needed to include MEF2 - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - }, - "net462": { - "frameworkAssemblies": { - // These are needed here as per: - // https://github.com/dotnet/cli/issues/3817 - "System.Numerics": "4.0.0.0", - "System.ComponentModel.DataAnnotations": "4.0.0.0" - }, - "dependencies": { - - } - } - } -} diff --git a/src/Tug.Server.Base/Tug.Server.Base.csproj b/src/Tug.Server.Base/Tug.Server.Base.csproj new file mode 100644 index 0000000..32afe94 --- /dev/null +++ b/src/Tug.Server.Base/Tug.Server.Base.csproj @@ -0,0 +1,49 @@ + + + + en-US + github.com/PowerShellOrg/tug/graphs/contributors + netstandard1.6;net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.Server.Base + Tug.Server.Base + $(PackageTargetFallback);portable-net45+win8 + 1.6.1 + false + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Tug.Server.Base/project.json b/src/Tug.Server.Base/project.json deleted file mode 100644 index a2c7f26..0000000 --- a/src/Tug.Server.Base/project.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - }, - - "dependencies": { - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Configuration": "1.1.0", - - "Microsoft.AspNetCore.Mvc": "1.1.1", - - "Tug.Base": { - "target": "project" - } - - }, - - "frameworks": { - "netstandard1.6": { - "imports": [ - "portable-net45+win8" // Needed to include MEF2 - ], - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.ComponentModel.Annotations": "4.3.0" - } - } - , - "net452": { - "frameworkAssemblies": { - // These are needed here as per: - // https://github.com/dotnet/cli/issues/3817 - "System.Numerics": "4.0.0.0", - "System.ComponentModel.DataAnnotations": "4.0.0.0" - }, - "dependencies": { - } - } - } -} diff --git a/src/Tug.Server.FaaS.AwsLambda/Tug.Server.FaaS.AwsLambda.csproj b/src/Tug.Server.FaaS.AwsLambda/Tug.Server.FaaS.AwsLambda.csproj new file mode 100644 index 0000000..0e4d4df --- /dev/null +++ b/src/Tug.Server.FaaS.AwsLambda/Tug.Server.FaaS.AwsLambda.csproj @@ -0,0 +1,64 @@ + + + + en-US + github.com/PowerShellOrg/tug/graphs/contributors + netcoreapp1.0 + $(NoWarn);CS0169;CS0649 + Tug.Server.FaaS.AwsLambda + Library + Tug.Server.FaaS.AwsLambda + 1.0.4 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + All + + + + + + + + diff --git a/src/Tug.Server.FaaS.AwsLambda/project.json b/src/Tug.Server.FaaS.AwsLambda/project.json deleted file mode 100644 index 29198ca..0000000 --- a/src/Tug.Server.FaaS.AwsLambda/project.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "emitEntryPoint": false, - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Binder": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - - // For testing out on dev-local - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - - "Microsoft.AspNetCore.Hosting": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.1", - "Microsoft.AspNetCore.Routing": "1.1.0", - - "AWSSDK.Core": "3.3.8.2", - "AWSSDK.Extensions.NETCore.Setup": "3.3.0.3", - "AWSSDK.DynamoDBv2": "3.3.2.1", - "AWSSDK.S3": "3.3.5.7", - "AWSSDK.CloudFront": "3.3.2.3", - - "Amazon.Lambda.Core": "1.0.0", - "Amazon.Lambda.APIGatewayEvents": "1.0.2", - "Amazon.Lambda.Serialization.Json": "1.0.1", - "Amazon.Lambda.AspNetCoreServer": "0.9.0-preview1", - "Amazon.Lambda.Logging.AspNetCore": "1.0.0", - - "Amazon.Lambda.Tools": { - "type": "build", - "version": "1.3.0-preview1" - }, - - "Tug.Base": { - "target": "project" - }, - "Tug.Server.Base": { - "target": "project" - } - }, - - "tools": { - "Amazon.Lambda.Tools" : "1.3.0-preview1" - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json" - ] - }, - - // "scripts": { - // "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - // }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" // Needed to include MEF2 - ] - } - } -} diff --git a/src/Tug.Server.Providers.Ps5DscHandler/Tug.Server.Providers.Ps5DscHandler.csproj b/src/Tug.Server.Providers.Ps5DscHandler/Tug.Server.Providers.Ps5DscHandler.csproj new file mode 100644 index 0000000..6ec3eea --- /dev/null +++ b/src/Tug.Server.Providers.Ps5DscHandler/Tug.Server.Providers.Ps5DscHandler.csproj @@ -0,0 +1,39 @@ + + + + en-US + github.com/PowerShellOrg/tug/graphs/contributors + net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.Server.Providers.Ps5DscHandler + Tug.Server.Providers.Ps5DscHandler + false + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + + + + diff --git a/src/Tug.Server.Providers.Ps5DscHandler/project.json b/src/Tug.Server.Providers.Ps5DscHandler/project.json deleted file mode 100644 index 9a1d58c..0000000 --- a/src/Tug.Server.Providers.Ps5DscHandler/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - }, - - "dependencies": { - "System.Management.Automation": "6.1.7601.17515", - - "Tug.Server.Base": { - "target": "project" - } - }, - - "frameworks": { - "net452": { - "dependencies": { - } - } - } -} diff --git a/src/Tug.Server/Tug.Server.csproj b/src/Tug.Server/Tug.Server.csproj new file mode 100644 index 0000000..f6d366f --- /dev/null +++ b/src/Tug.Server/Tug.Server.csproj @@ -0,0 +1,70 @@ + + + + en-US + github.com/PowerShellOrg/tug/graphs/contributors + netcoreapp1.0;net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.Server + Exe + Tug.Server + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + 1.0.4 + false + false + false + false + false + false + false + false + false + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);DOTNET_CORE + + + + $(DefineConstants);DOTNET_FRAMEWORK + + + diff --git a/src/Tug.Server/project.json b/src/Tug.Server/project.json deleted file mode 100644 index 95a3d77..0000000 --- a/src/Tug.Server/project.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - // Assembly Manifest Details are defined in - // AssemblyInfo.cs and SharedAssemblyInfo.cs - - "authors": [ - "github.com/PowerShellOrg/tug/graphs/contributors" - ], - "language": "en-US", - - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ], - - "compile": { - "includeFiles": [ - // Include in the shared assembly manifest details - "../shared/SharedAssemblyInfo.cs", - "../shared/SharedAssemblyVersionInfo.cs" - ] - } - - // TODO: Temporarily disabled because it causes an error at build - // "The given key was not present in the dictionary." when we added - // a project dependency to Tug.Core; this may not be needed if we do - // not add Razor views to our project (needed for runtime compilation) - //, - //"preserveCompilationContext": true - }, - - "publishOptions": { - "include": [ - "wwwroot", - "nlog.config", - "web.config" - ] - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "tooling": { - "defaultNamespace": "Tug.Server" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "commands": { - "web": "Microsoft.AspNet.Server.Kestrel" - }, - - "dependencies": { - "Microsoft.Extensions.Logging.Console": "1.1.0", - "NLog.Extensions.Logging": "1.0.0-rtm-alpha5", - - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.1", - - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - - "Tug.Base": { - "target": "project" - }, - "Tug.Server.Base": { - "target": "project" - } - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ - "DOTNET_CORE" - ] - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" // Needed to include MEF2 - ], - "dependencies": { - "Microsoft.NETCore.App": { - // This will generate a framework-dependent deployment - "type": "platform", - "version": "1.0.1" - }, - "System.Security.Cryptography.Algorithms": "4.3.0" - } - }, - "net452": { - "buildOptions": { - "define": [ - "DOTNET_FRAMEWORK" - ] - }, - "dependencies": { - // // This one is specific to .NET Framework only - // "Tug.Server.Providers.Ps5DscHandler": { - // "target": "project" - // } - } - } - } -} diff --git a/test/Tug.Ext-tests-aux/Tug.Ext-tests-aux.csproj b/test/Tug.Ext-tests-aux/Tug.Ext-tests-aux.csproj new file mode 100644 index 0000000..5ef38c3 --- /dev/null +++ b/test/Tug.Ext-tests-aux/Tug.Ext-tests-aux.csproj @@ -0,0 +1,23 @@ + + + + 0.5.0 + netcoreapp1.0;net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.Ext-tests-aux + Tug.Ext-tests-aux + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + 1.0.4 + + + + + + + + + + + + diff --git a/test/Tug.Ext-tests-aux/project.json b/test/Tug.Ext-tests-aux/project.json deleted file mode 100644 index 96aaa60..0000000 --- a/test/Tug.Ext-tests-aux/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "Tug.Ext-tests-aux", - "version": "0.5.0-*", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ] - }, - - "dependencies": { - "Tug.Ext-tests": { - "target": "project" - } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - } - }, - "net452": { - "buildOptions": {}, - "dependencies": {} - } - } -} diff --git a/test/Tug.Ext-tests/Tug.Ext-tests.csproj b/test/Tug.Ext-tests/Tug.Ext-tests.csproj new file mode 100644 index 0000000..56cef07 --- /dev/null +++ b/test/Tug.Ext-tests/Tug.Ext-tests.csproj @@ -0,0 +1,43 @@ + + + + 0.5.0 + netcoreapp1.0;net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.Ext-tests + Tug.Ext-tests + true + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + 1.0.4 + + + + + + + + + + + + + + + + + + + $(DefineConstants);DOTNET_CORE + + + + $(DefineConstants);DOTNET_FRAMEWORK + + + + + + + + diff --git a/test/Tug.Ext-tests/project.json b/test/Tug.Ext-tests/project.json deleted file mode 100644 index 6dea854..0000000 --- a/test/Tug.Ext-tests/project.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - // This file has been adjusted from the stock xunittest project type to support MSTestv2 as per:"authors": - // https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/01/announcing-mstest-v2-framework-support-for-net-core-1-0-rtm/ - - "name": "Tug.Ext-tests", - "version": "0.5.0-*", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ] - }, - - // "testRunner": "xunit", - "testRunner": "mstest", - - "dependencies": { - // "System.Runtime.Serialization.Primitives": "4.1.1", - // "xunit": "2.1.0", - // "dotnet-test-xunit": "1.0.0-rc2-192208-24" - - "Microsoft.Extensions.Logging": "1.1.0", - - "dotnet-test-mstest": "1.1.2-preview", - "MSTest.TestFramework": "1.1.11", - - // Assemblies under test - "Tug.Base": { - "target": "project" - } - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ - "DOTNET_CORE" - ] - }, - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Loader": "4.3.0" - } - }, - "net452": { - "buildOptions": { - "define": [ - "DOTNET_FRAMEWORK" - ] - }, - "dependencies": {} - } - } -} diff --git a/test/Tug.UnitTesting/Tug.UnitTesting.csproj b/test/Tug.UnitTesting/Tug.UnitTesting.csproj new file mode 100644 index 0000000..6bf20f5 --- /dev/null +++ b/test/Tug.UnitTesting/Tug.UnitTesting.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp1.0;net452 + $(NoWarn);CS0169;CS0649 + portable + Tug.UnitTesting + Tug.UnitTesting + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + 1.0.4 + + + + + + + + + + + + diff --git a/test/Tug.UnitTesting/project.json b/test/Tug.UnitTesting/project.json deleted file mode 100644 index cd40b92..0000000 --- a/test/Tug.UnitTesting/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "1.0.0-*", - - "buildOptions": { - "debugType": "portable", - "nowarn": [ - "CS0169", // The field 'X' is never used - "CS0649" // Field 'X' is never assigned to, and will always have its default value null - ] - }, - - "dependencies": { - "dotnet-test-mstest": "1.1.2-preview", - "MSTest.TestFramework": "1.1.11" - }, - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - }, - "net452": { - } - } -}