From 33d42551acdd59ce0d28a9b98e8921b8969ec648 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 7 Jan 2019 10:44:26 -0800 Subject: [PATCH] Fix MusicStore PackageReferences and cleanup README --- Directory.Build.targets | 1 + global.json | 2 +- src/MusicStore/Directory.Build.targets | 11 ---- src/MusicStore/README.md | 15 +----- src/MusicStore/build/dependencies.props | 51 ------------------- src/MusicStore/build/repo.props | 12 ----- .../samples/MusicStore/MusicStore.csproj | 39 +++++++------- .../MusicStore/Properties/launchSettings.json | 39 +++++++++----- .../MusicStore.E2ETests.csproj | 30 +++++------ 9 files changed, 65 insertions(+), 135 deletions(-) delete mode 100644 src/MusicStore/Directory.Build.targets delete mode 100644 src/MusicStore/build/dependencies.props delete mode 100644 src/MusicStore/build/repo.props diff --git a/Directory.Build.targets b/Directory.Build.targets index f523cdbbb2..5db9ed97ab 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -61,5 +61,6 @@ + diff --git a/global.json b/global.json index fdc8dcb766..ae29c6398a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.1-build-20181213.2" + "Internal.AspNetCore.Sdk": "2.2.1-build-20190104.5" } } diff --git a/src/MusicStore/Directory.Build.targets b/src/MusicStore/Directory.Build.targets deleted file mode 100644 index 506c1e4e1f..0000000000 --- a/src/MusicStore/Directory.Build.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/src/MusicStore/README.md b/src/MusicStore/README.md index 7574a9b660..011866be61 100644 --- a/src/MusicStore/README.md +++ b/src/MusicStore/README.md @@ -1,20 +1,9 @@ MusicStore (test application) ============================= -AppVeyor: [![AppVeyor][appveyor-badge]][appveyor-build] +This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/aspnetcore) repo. -Travis: [![Travis][travis-badge]][travis-build] - -[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true -[appveyor-build]: https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev -[travis-badge]: https://travis-ci.org/aspnet/MusicStore.svg?branch=dev -[travis-build]: https://travis-ci.org/aspnet/MusicStore - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -## About this repo - -This repository is a test application used for ASP.NET Core internal test processes. +This is a test application used for ASP.NET Core internal test processes. It is not intended to be a representative sample of how to use ASP.NET Core. Samples and docs for ASP.NET Core can be found here: . diff --git a/src/MusicStore/build/dependencies.props b/src/MusicStore/build/dependencies.props deleted file mode 100644 index 0823a8fc56..0000000000 --- a/src/MusicStore/build/dependencies.props +++ /dev/null @@ -1,51 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.0.9 - 2.1.3 - 2.2.0-preview3-26927-02 - 2.2.0-preview3-35359 - 15.6.1 - 2.0.3 - 4.6.0-preview3-26927-02 - 2.3.1 - 2.4.0 - - - - diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props deleted file mode 100644 index 6d30be91fb..0000000000 --- a/src/MusicStore/build/repo.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index cef0f5d934..d26c83980c 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -17,7 +17,7 @@ - + @@ -26,25 +26,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json index a2f3822f09..246b7a0b47 100644 --- a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json +++ b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json @@ -1,27 +1,42 @@ { "iisSettings": { - "windowsAuthentication": false, + "windowsAuthentication": true, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:4088/", + "applicationUrl": "http://localhost:5762/", "sslPort": 0 } }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" } }, - "MusicStore": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" } } } -} \ No newline at end of file +} diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index c03cfd52ad..40c96cbd9b 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.2 @@ -15,20 +15,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + +