diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index 7dba59ba1..fd88b260e 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}" EndProject @@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject docker-compose.override.yml = docker-compose.override.yml docker-compose.yml = docker-compose.yml - global.json = global.json NuGet.config = NuGet.config EndProjectSection EndProject @@ -23,31 +22,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ordering", "Ordering", "{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Basket.API", "src\Services\Basket\Basket.API\Basket.API.xproj", "{2110CBB0-3B38-4EE4-A743-DF6968D80D90}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Catalog.API", "src\Services\Catalog\Catalog.API\Catalog.API.xproj", "{42681D9D-750A-4DF7-BD9F-9292CFD5C253}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{EF0337F2-ED00-4643-89FD-EE10863F1870}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.API", "src\Services\Ordering\Ordering.API\Ordering.API.xproj", "{231226CE-690B-4979-8870-9A79D80928E2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{24CD3B53-141E-4A07-9B0D-796641E1CF78}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Domain", "src\Services\Ordering\Ordering.Domain\Ordering.Domain.xproj", "{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basket.API", "src\Services\Basket\Basket.API\Basket.API.csproj", "{2110CBB0-3B38-4EE4-A743-DF6968D80D90}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalog.API", "src\Services\Catalog\Catalog.API\Catalog.API.csproj", "{42681D9D-750A-4DF7-BD9F-9292CFD5C253}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{EF0337F2-ED00-4643-89FD-EE10863F1870}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.API", "src\Services\Ordering\Ordering.API\Ordering.API.csproj", "{231226CE-690B-4979-8870-9A79D80928E2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebMVC", "src\Web\WebMVC\eShopOnContainers.WebMVC.xproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Domain", "src\Services\Ordering\Ordering.Domain\Ordering.Domain.csproj", "{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebSPA", "src\Web\WebSPA\eShopOnContainers.WebSPA\eShopOnContainers.WebSPA.xproj", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebMVC", "src\Web\WebMVC\WebMVC.csproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Infrastructure", "src\Services\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.xproj", "{95F1F07C-4D92-4742-BD07-E5B805AAB651}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "eShopOnContainers.WebSPA", "src\Web\WebSPA\eShopOnContainers.WebSPA\eShopOnContainers.WebSPA.csproj", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.xproj", "{621E7211-58D0-45FD-9600-1CB490BD930E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Infrastructure", "src\Services\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.csproj", "{95F1F07C-4D92-4742-BD07-E5B805AAB651}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTest", "test\Services\UnitTest\UnitTest.xproj", "{7796F5D8-31FC-45A4-B673-19DE5BA194CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.csproj", "{621E7211-58D0-45FD-9600-1CB490BD930E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{24CD3B53-141E-4A07-9B0D-796641E1CF78}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "test\Services\UnitTest\UnitTest.csproj", "{7796F5D8-31FC-45A4-B673-19DE5BA194CF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.csproj", "{A579E108-5445-403D-A407-339AC4D1611B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -457,17 +456,17 @@ Global {326A7FB3-5295-468C-A4FE-67DCB823E1E5} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} + {EF0337F2-ED00-4643-89FD-EE10863F1870} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E} + {24CD3B53-141E-4A07-9B0D-796641E1CF78} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} {2110CBB0-3B38-4EE4-A743-DF6968D80D90} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} {42681D9D-750A-4DF7-BD9F-9292CFD5C253} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5} {231226CE-690B-4979-8870-9A79D80928E2} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {F5598DCB-6DDE-4661-AD9D-A55612DA7E76} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} - {EF0337F2-ED00-4643-89FD-EE10863F1870} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E} {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} {95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {621E7211-58D0-45FD-9600-1CB490BD930E} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {7796F5D8-31FC-45A4-B673-19DE5BA194CF} = {EF0337F2-ED00-4643-89FD-EE10863F1870} - {24CD3B53-141E-4A07-9B0D-796641E1CF78} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} {A579E108-5445-403D-A407-339AC4D1611B} = {24CD3B53-141E-4A07-9B0D-796641E1CF78} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index 1fe3e7546..000000000 --- a/global.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "projects": [ - "src", - "test", - "src/Services/Ordering", - "src/Web", - "src/Services/Catalog" - ], - - "sdk": { - "version": "1.0.0-preview2-003131" - } -} diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj new file mode 100644 index 000000000..c0a11ef9d --- /dev/null +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -0,0 +1,38 @@ + + + + netcoreapp1.1 + portable + true + Basket.API + Exe + Basket.API + 1.1.0 + $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Basket/Basket.API/Basket.API.xproj b/src/Services/Basket/Basket.API/Basket.API.xproj deleted file mode 100644 index d734a83ad..000000000 --- a/src/Services/Basket/Basket.API/Basket.API.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2110cbb0-3b38-4ee4-a743-df6968d80d90 - Microsoft.eShopOnContainers.Services.Basket.API - .\obj - .\bin\ - v4.6 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Services/Basket/Basket.API/project.json b/src/Services/Basket/Basket.API/project.json deleted file mode 100644 index 4ca72f510..000000000 --- a/src/Services/Basket/Basket.API/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "System.Threading": "4.3.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "StackExchange.Redis": "1.1.608", - "Newtonsoft.Json": "9.0.1", - "IdentityServer4.AccessTokenValidation": "1.0.1-rc3", - "Swashbuckle": "6.0.0-beta902" - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "netstandard1.6.1", - "dnxcore50", - "portable-net451+win8" - ] - } - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config", - "Dockerfile", - "docker-compose.yml", - ".dockerignore" - ] - }, - "scripts": { - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - } -} \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj new file mode 100644 index 000000000..9ec9eee72 --- /dev/null +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -0,0 +1,46 @@ + + + + netcoreapp1.1 + portable + true + Catalog.API + Exe + Catalog.API + aspnet-Catalog.API-20161122013618 + 1.1.0 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.xproj b/src/Services/Catalog/Catalog.API/Catalog.API.xproj deleted file mode 100644 index f3fba7286..000000000 --- a/src/Services/Catalog/Catalog.API/Catalog.API.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 42681d9d-750a-4df7-bd9f-9292cfd5c253 - Microsoft.eShopOnContainers.Services.Catalog.API - .\obj - .\bin\ - v4.6 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/project.json b/src/Services/Catalog/Catalog.API/project.json deleted file mode 100644 index 67d3b95cd..000000000 --- a/src/Services/Catalog/Catalog.API/project.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.EntityFrameworkCore": "1.1.0", - "Microsoft.EntityFrameworkCore.Relational": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.EntityFrameworkCore.Design": "1.1.0", - "Swashbuckle": "6.0.0-beta902" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Pics", - "Views", - "Areas/**/Views", - "settings.json", - "web.config", - "project.json", - "Dockerfile" - ] - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "scripts": {}, - "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" - }, - "userSecretsId": "aspnet-Catalog.API-20161122013618" -} \ No newline at end of file diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj new file mode 100644 index 000000000..045003747 --- /dev/null +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -0,0 +1,65 @@ + + + + netcoreapp1.0 + portable + true + Identity.API + Exe + Identity.API + aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 + 1.1.0 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + All + + + All + + + + + + + + + + + All + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Identity/Identity.API/Identity.API.xproj b/src/Services/Identity/Identity.API/Identity.API.xproj deleted file mode 100644 index c767e3c0b..000000000 --- a/src/Services/Identity/Identity.API/Identity.API.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a579e108-5445-403d-a407-339ac4d1611b - Identity.API - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/src/Services/Identity/Identity.API/project.json b/src/Services/Identity/Identity.API/project.json deleted file mode 100644 index fa9795162..000000000 --- a/src/Services/Identity/Identity.API/project.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "userSecretsId": "aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5", - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer.Design": { - "version": "1.1.0", - "type": "build" - }, - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.1.0-preview4-final", - "type": "build" - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.1.0-preview4-final", - "type": "build" - }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.1.0-preview4-final", - "type": "build" - }, - "IdentityServer4.AspNetIdentity": "1.0.0-rc3", - "IdentityServer4.EntityFramework": "1.0.0-rc3", - }, - - "tools": { - "BundlerMinifier.Core": "2.0.238", - "Microsoft.AspNetCore.Razor.Tools": "1.1.0-preview4-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final", - "Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.1.0-preview4-final", - "imports": [ - "portable-net45+win8" - ] - } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config", - "Dockerfile", - "docker-compose.yml", - ".dockerignore" - ] - }, - "scripts": { - "prepublish": [ - "bower install", - "dotnet bundle" - ] - //"postpublish": [ - // "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - //] - } -} diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj new file mode 100644 index 000000000..0e118e0a1 --- /dev/null +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -0,0 +1,56 @@ + + + + netcoreapp1.1 + portable + true + Ordering.API + Exe + Ordering.API + aspnet-Ordering.API-20161122013547 + 1.1.0 + $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.xproj b/src/Services/Ordering/Ordering.API/Ordering.API.xproj deleted file mode 100644 index 376311e91..000000000 --- a/src/Services/Ordering/Ordering.API/Ordering.API.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 231226ce-690b-4979-8870-9a79d80928e2 - Microsoft.eShopOnContainers.Services.Ordering.API - .\obj - .\bin\ - v4.6 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Services/Ordering/Ordering.API/project.json b/src/Services/Ordering/Ordering.API/project.json deleted file mode 100644 index 291892b40..000000000 --- a/src/Services/Ordering/Ordering.API/project.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "MediatR.Extensions.Microsoft.DependencyInjection": "1.1.0", - "Autofac.Extensions.DependencyInjection": "4.0.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel":"1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging.Abstractions": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.EntityFrameworkCore": "1.1.0", - "Microsoft.EntityFrameworkCore.Design":"1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer.Design": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Swashbuckle": "6.0.0-beta902", - "MediatR": "2.1.0", - "System.Reflection": "4.3.0", - "IdentityServer4.AccessTokenValidation": "1.0.1-rc3", - "Dapper": "1.50.2", - "Ordering.Domain": "1.0.0-*", - "Ordering.Infrastructure": "1.0.0-*" - }, - "tools": { - "Microsoft.EntityFrameworkCore.Tools.DotNet": "1.1.0-preview4-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "netstandard1.6.1", - "dnxcore50", - "portable-net451+win8" - ] - } - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "settings.json", - "web.config", - "docker-compose.yml", - "docker-compose.debug.yml", - "Dockerfile.debug", - "Dockerfile", - ".dockerignore" - ] - }, - "scripts": { - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - }, - "userSecretsId": "aspnet-Ordering.API-20161122013547" -} \ No newline at end of file diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj new file mode 100644 index 000000000..b96e1884a --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj @@ -0,0 +1,14 @@ + + + + netstandard1.6.1 + Ordering.Domain + Ordering.Domain + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj deleted file mode 100644 index 8c34c7562..000000000 --- a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f5598dcb-6dde-4661-ad9d-a55612da7e76 - Microsoft.eShopOnContainers.Services.Ordering.Domain - .\obj - .\bin\ - v4.6 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Services/Ordering/Ordering.Domain/project.json b/src/Services/Ordering/Ordering.Domain/project.json deleted file mode 100644 index 2feeaa08d..000000000 --- a/src/Services/Ordering/Ordering.Domain/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - - "frameworks": { - "netstandard1.6.1": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj new file mode 100644 index 000000000..4ec458dbd --- /dev/null +++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -0,0 +1,23 @@ + + + + netstandard1.6.1 + Ordering.Infrastructure + Ordering.Infrastructure + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.xproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.xproj deleted file mode 100644 index 21d5cdd3f..000000000 --- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 95f1f07c-4d92-4742-bd07-e5b805aab651 - Microsoft.eShopOnContainers.Services.Ordering.Infrastructure - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Services/Ordering/Ordering.Infrastructure/project.json b/src/Services/Ordering/Ordering.Infrastructure/project.json deleted file mode 100644 index 5d5355dfc..000000000 --- a/src/Services/Ordering/Ordering.Infrastructure/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.EntityFrameworkCore": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Ordering.Domain": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6.1": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj new file mode 100644 index 000000000..22d7faeae --- /dev/null +++ b/src/Web/WebMVC/WebMVC.csproj @@ -0,0 +1,58 @@ + + + + netcoreapp1.0 + portable + true + WebMVC + Exe + WebMVC + aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3 + 1.1.0 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + All + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Web/WebMVC/eShopOnContainers.WebMVC.xproj b/src/Web/WebMVC/eShopOnContainers.WebMVC.xproj deleted file mode 100644 index fd881f974..000000000 --- a/src/Web/WebMVC/eShopOnContainers.WebMVC.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f0333d8e-0b27-42b7-b2c6-78f3657624e2 - Microsoft.eShopOnContainers.WebMVC - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - - diff --git a/src/Web/WebMVC/project.json b/src/Web/WebMVC/project.json deleted file mode 100644 index cc45e7095..000000000 --- a/src/Web/WebMVC/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "userSecretsId": "aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3", - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.1", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Newtonsoft.Json": "9.0.1", - "System.IdentityModel.Tokens.Jwt": "5.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.Extensions.Options": "1.1.0" - }, - "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", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8" - ] - } - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "appsettings.override.json", - "web.config", - "Dockerfile", - "docker-compose.yml", - ".dockerignore" - ] - }, - "scripts": { - "prepublish": [ - "bower install", - "dotnet bundle" - ], - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - } -} \ No newline at end of file diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj new file mode 100644 index 000000000..517b447f3 --- /dev/null +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj @@ -0,0 +1,59 @@ + + + + netcoreapp1.0 + portable + true + eShopOnContainers.WebSPA + Exe + eShopOnContainers.WebSPA + aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 + 1.1.0 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + All + + + + + + + + + + + + + + + + diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.xproj b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.xproj deleted file mode 100644 index e4ab30de3..000000000 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 9842db3a-1391-48c7-a49c-2fabd0a18ac2 - eShopOnContainers.WebSPA - - - 2.0 - - - diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/project.json b/src/Web/WebSPA/eShopOnContainers.WebSPA/project.json deleted file mode 100644 index 1df90ea9a..000000000 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/project.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "userSecretsId": "aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119", - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.1", - "Microsoft.AspNetCore.Cors": "1.1.0", - "Microsoft.AspNetCore.Antiforgery": "1.1.0", - "Microsoft.AspNetCore.Authorization": "1.1.0", - "Newtonsoft.Json": "9.0.1", - "Webpack": "3.0.0", - "Microsoft.AspNetCore.AngularServices": "1.0.0-beta-000014", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Http.Abstractions": "1.1.0", - "Microsoft.Extensions.Options": "1.1.0" - }, - "tools": { - "Microsoft.DotNet.Watcher.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net451+win8+dnxcore50" - }, - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.Extensions.SecretManager.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - } - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": [ - "node_modules", - "Client" - ] - }, - "debugType": "portable" - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "publishOptions": { - "include": [ - "appsettings.json", - "Client", - "typings", - "Views", - "tsconfig.json", - "tsd.json", - "web.config", - "config", - "wwwroot", - "dockerfile" - ] - }, - "scripts": { - "prepublish": [ - "npm run build:prod" - ], - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - }, - "tooling": { - "defaultNamespace": "eShopOnContainers.SPA" - } -} \ No newline at end of file diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj new file mode 100644 index 000000000..61ba4b3f6 --- /dev/null +++ b/test/Services/FunctionalTests/FunctionalTests.csproj @@ -0,0 +1,34 @@ + + + + netcoreapp1.1 + FunctionalTests + FunctionalTests + true + 1.1.0 + $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + false + false + false + + + + + PreserveNewest + + + + + + + + + + + + + + + + + diff --git a/test/Services/FunctionalTests/FunctionalTests.xproj b/test/Services/FunctionalTests/FunctionalTests.xproj deleted file mode 100644 index f42aea110..000000000 --- a/test/Services/FunctionalTests/FunctionalTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 621e7211-58d0-45fd-9600-1cb490bd930e - FunctionalTests - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Services/FunctionalTests/project.json b/test/Services/FunctionalTests/project.json deleted file mode 100644 index 9db48cfb1..000000000 --- a/test/Services/FunctionalTests/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "Microsoft.AspNetCore.TestHost": "1.1.0", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "xunit": "2.2.0-beta4-build3444", - "Catalog.API": "1.0.0-*", - "Ordering.API": "1.0.0-*" - }, - "testRunner": "xunit", - //"runtimes": { - // "win10-x64": {} - //}, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "netstandard1.6.1", - "dnxcore50", - "portable-net451+win8" - ] - } - }, - "publishOptions": { - "include": [ - "settings.json", - "web.config" - ] - } -} diff --git a/test/Services/UnitTest/UnitTest.csproj b/test/Services/UnitTest/UnitTest.csproj new file mode 100644 index 000000000..ffa047249 --- /dev/null +++ b/test/Services/UnitTest/UnitTest.csproj @@ -0,0 +1,30 @@ + + + + netcoreapp1.1 + UnitTest + UnitTest + true + 1.1.0 + $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + false + false + false + + + + + + + + + + + + + + + + + + diff --git a/test/Services/UnitTest/UnitTest.xproj b/test/Services/UnitTest/UnitTest.xproj deleted file mode 100644 index 1d3c09c84..000000000 --- a/test/Services/UnitTest/UnitTest.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7796f5d8-31fc-45a4-b673-19de5ba194cf - UnitTest - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Services/UnitTest/project.json b/test/Services/UnitTest/project.json deleted file mode 100644 index e44322750..000000000 --- a/test/Services/UnitTest/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "MediatR": "2.1.0", - "Moq": "4.6.38-alpha", - "xunit": "2.2.0-beta4-build3444", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Ordering.API": "1.0.0-*", - "Ordering.Infrastructure": "1.0.0-*", - "Ordering.Domain": "1.0.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "netstandard1.6.1", - "dnxcore50", - "portable-net451+win8" - ] - } - } -}