diff --git a/Podsync.sln b/Podsync.sln index 75b55af..1d8f645 100644 --- a/Podsync.sln +++ b/Podsync.sln @@ -1,22 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26127.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3EF2294C-C807-46F3-B3F4-98B7F30688D0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{15355284-4B88-4EF3-B580-20907F343E43}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore - global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Podsync", "src\Podsync\Podsync.xproj", "{C9283472-E95E-4517-AE3B-3E276B9851E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podsync", "src\Podsync\Podsync.csproj", "{C9283472-E95E-4517-AE3B-3E276B9851E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D94416F2-31EA-4D38-A3D0-BB74180687D4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Podsync.Tests", "test\Podsync.Tests\Podsync.Tests.xproj", "{990B29B3-C581-4D60-A34B-36499E2849BA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{35F181BF-B2AD-42AB-BB11-DC66D57E6514}" ProjectSection(SolutionItems) = preProject src\Shared\EnumerableExtensions.cs = src\Shared\EnumerableExtensions.cs @@ -25,27 +22,49 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{35F181 src\Shared\StringExtensions.cs = src\Shared\StringExtensions.cs EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podsync.Tests", "test\Podsync.Tests\Podsync.Tests.csproj", "{81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|x64.ActiveCfg = Debug|x64 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|x64.Build.0 = Debug|x64 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|x86.ActiveCfg = Debug|x86 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Debug|x86.Build.0 = Debug|x86 {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|Any CPU.Build.0 = Release|Any CPU - {990B29B3-C581-4D60-A34B-36499E2849BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {990B29B3-C581-4D60-A34B-36499E2849BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {990B29B3-C581-4D60-A34B-36499E2849BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {990B29B3-C581-4D60-A34B-36499E2849BA}.Release|Any CPU.Build.0 = Release|Any CPU + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|x64.ActiveCfg = Release|x64 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|x64.Build.0 = Release|x64 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|x86.ActiveCfg = Release|x86 + {C9283472-E95E-4517-AE3B-3E276B9851E4}.Release|x86.Build.0 = Release|x86 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|x64.ActiveCfg = Debug|x64 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|x64.Build.0 = Debug|x64 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|x86.ActiveCfg = Debug|x86 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Debug|x86.Build.0 = Debug|x86 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|Any CPU.Build.0 = Release|Any CPU + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|x64.ActiveCfg = Release|x64 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|x64.Build.0 = Release|x64 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|x86.ActiveCfg = Release|x86 + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {C9283472-E95E-4517-AE3B-3E276B9851E4} = {3EF2294C-C807-46F3-B3F4-98B7F30688D0} - {990B29B3-C581-4D60-A34B-36499E2849BA} = {D94416F2-31EA-4D38-A3D0-BB74180687D4} {35F181BF-B2AD-42AB-BB11-DC66D57E6514} = {3EF2294C-C807-46F3-B3F4-98B7F30688D0} + {81ABAF5F-4CB6-42A6-8EAA-19EB9BAF66AA} = {D94416F2-31EA-4D38-A3D0-BB74180687D4} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index e793049..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003121" - } -} diff --git a/src/Podsync/Dockerfile b/src/Podsync/Dockerfile index cbdd3b0..00f0965 100644 --- a/src/Podsync/Dockerfile +++ b/src/Podsync/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.0.3 +FROM microsoft/aspnetcore:1.1.0-runtime ARG PUBLISH_DIR="bin/Publish" diff --git a/src/Podsync/Podsync.csproj b/src/Podsync/Podsync.csproj new file mode 100644 index 0000000..7eedcb7 --- /dev/null +++ b/src/Podsync/Podsync.csproj @@ -0,0 +1,51 @@ + + + netcoreapp1.1 + true + Podsync + Exe + Podsync + aspnet-Podsync-20161004104901 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Podsync/Podsync.xproj b/src/Podsync/Podsync.xproj deleted file mode 100644 index 0deb346..0000000 --- a/src/Podsync/Podsync.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c9283472-e95e-4517-ae3b-3e276b9851e4 - Podsync - .\obj - .\bin\ - v4.6.1 - - - 2.0 - /subscriptions/6ced39ae-0008-4531-bf42-4c517d4fb309/resourcegroups/podsync_group/providers/microsoft.insights/components/podsync - - - - - - \ No newline at end of file diff --git a/src/Podsync/project.json b/src/Podsync/project.json deleted file mode 100644 index d9b9dc5..0000000 --- a/src/Podsync/project.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "dependencies": { - "Google.Apis.YouTube.v3": "1.16.0.582", - "Hashids.net": "1.2.2", - "MedallionShell": "1.2.1", - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.HttpOverrides": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.AspNetCore.WebUtilities": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", - "StackExchange.Redis": "1.2.0", - "System.Xml.XmlSerializer": "4.0.11" - }, - "tools": { - "BundlerMinifier.Core": "2.0.238", - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": "..\\Shared\\*.cs" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config", - "Dockerfile", - "youtube-dl" - ] - }, - "scripts": { - "precompile": [ - "dotnet bundle" - ], - "prepublish": [ - "bower install", - "dotnet bundle" - ], - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - }, - "userSecretsId": "aspnet-Podsync-20161004104901" -} \ No newline at end of file diff --git a/src/Podsync/runtimeconfig.template.json b/src/Podsync/runtimeconfig.template.json new file mode 100644 index 0000000..7305508 --- /dev/null +++ b/src/Podsync/runtimeconfig.template.json @@ -0,0 +1,5 @@ +{ + "configProperties": { + "System.GC.Server": true + } +} \ No newline at end of file diff --git a/test/Podsync.Tests/Podsync.Tests.csproj b/test/Podsync.Tests/Podsync.Tests.csproj new file mode 100644 index 0000000..99047b6 --- /dev/null +++ b/test/Podsync.Tests/Podsync.Tests.csproj @@ -0,0 +1,25 @@ + + + netcoreapp1.1 + Podsync.Tests + Podsync.Tests + true + aspnet-Podsync-20161004104901 + false + false + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Podsync.Tests/Podsync.Tests.xproj b/test/Podsync.Tests/Podsync.Tests.xproj deleted file mode 100644 index a3b0907..0000000 --- a/test/Podsync.Tests/Podsync.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 990b29b3-c581-4d60-a34b-36499e2849ba - Podsync.Tests - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Podsync.Tests/project.json b/test/Podsync.Tests/project.json deleted file mode 100644 index e12476b..0000000 --- a/test/Podsync.Tests/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "1.0.0-*", - "testRunner": "xunit", - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.TestHost": "1.0.1", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Moq": "4.6.38-alpha", - "Podsync": "1.0.0-*", - "System.Xml.XmlSerializer": "4.0.11", - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "copyToOutput": [ - "project.json" - ] - }, - - "userSecretsId": "aspnet-Podsync-20161004104901" -}