Skip to content

Commit 33d4255

Browse files
jkotalikjkotalik
committed
Fix MusicStore PackageReferences and cleanup README
1 parent 2e67864 commit 33d4255

File tree

9 files changed

+65
-135
lines changed

9 files changed

+65
-135
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@
6161
<Import Project="eng\targets\Cpp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
6262
<Import Project="eng\targets\CSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
6363
<Import Project="eng\targets\FSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
64+
<Import Project="eng\targets\SharedFx.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
6465
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
6566
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "2.2.100"
44
},
55
"msbuild-sdks": {
6-
"Internal.AspNetCore.Sdk": "2.2.1-build-20181213.2"
6+
"Internal.AspNetCore.Sdk": "2.2.1-build-20190104.5"
77
}
88
}

‎src/MusicStore/Directory.Build.targets

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/MusicStore/README.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
MusicStore (test application)
22
=============================
33

4-
AppVeyor: [![AppVeyor][appveyor-badge]][appveyor-build]
4+
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.
55

6-
Travis: [![Travis][travis-badge]][travis-build]
7-
8-
[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true
9-
[appveyor-build]: https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev
10-
[travis-badge]: https://travis-ci.org/aspnet/MusicStore.svg?branch=dev
11-
[travis-build]: https://travis-ci.org/aspnet/MusicStore
12-
13-
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.
14-
15-
## About this repo
16-
17-
This repository is a test application used for ASP.NET Core internal test processes.
6+
This is a test application used for ASP.NET Core internal test processes.
187
It is not intended to be a representative sample of how to use ASP.NET Core.
198

209
Samples and docs for ASP.NET Core can be found here: <https://docs.asp.net>.

‎src/MusicStore/build/dependencies.props

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/MusicStore/build/repo.props

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/MusicStore/samples/MusicStore/MusicStore.csproj

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
20-
<NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModule\AspNetCore\AspNetCore.vcxproj" />
20+
<NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
2121
<NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
2222
</ItemGroup>
2323

@@ -26,25 +26,24 @@
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' OR '$(Configuration)' != 'RuntimeStore' ">
29-
<PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCorePackageVersion)" />
30-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
31-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion)" />
32-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="$(MicrosoftAspNetCoreAuthenticationGooglePackageVersion)" />
33-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="$(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion)" />
34-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
35-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(MicrosoftAspNetCoreAuthenticationTwitterPackageVersion)" />
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
37-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion)" />
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
39-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" PrivateAssets="All" Version="$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion)" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="$(MicrosoftAspNetCoreServerHttpSysPackageVersion)" />
41-
<PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="$(MicrosoftAspNetCoreServerIISPackageVersion)" />
42-
<PackageReference Include="Microsoft.AspNetCore.Session" Version="$(MicrosoftAspNetCoreSessionPackageVersion)" />
43-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
44-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
45-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
46-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
47-
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
29+
<Reference Include="Microsoft.AspNetCore" />
30+
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
31+
<Reference Include="Microsoft.AspNetCore.Authentication.Facebook" />
32+
<Reference Include="Microsoft.AspNetCore.Authentication.Google" />
33+
<Reference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
34+
<Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
35+
<Reference Include="Microsoft.AspNetCore.Authentication.Twitter" />
36+
<Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
37+
<Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
38+
<Reference Include="Microsoft.AspNetCore.Mvc" />
39+
<Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
40+
<Reference Include="Microsoft.AspNetCore.Server.IIS" />
41+
<Reference Include="Microsoft.AspNetCore.Session" />
42+
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
43+
<Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
44+
<Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
45+
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
46+
<Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
4847
</ItemGroup>
4948

5049
<Target Name="VerifyPrecompiledViews" AfterTargets="Publish">

‎src/MusicStore/samples/MusicStore/Properties/launchSettings.json

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,42 @@
11
{
22
"iisSettings": {
3-
"windowsAuthentication": false,
3+
"windowsAuthentication": true,
44
"anonymousAuthentication": true,
55
"iisExpress": {
6-
"applicationUrl": "http://localhost:4088/",
6+
"applicationUrl": "http://localhost:5762/",
77
"sslPort": 0
88
}
99
},
1010
"profiles": {
11-
"IIS Express": {
12-
"commandName": "IISExpress",
13-
"launchBrowser": true,
11+
"ANCM IIS Express": {
12+
"commandName": "Executable",
13+
"executablePath": "$(IISExpressPath)",
14+
"commandLineArgs": "$(IISExpressArguments)",
1415
"environmentVariables": {
15-
"ASPNETCORE_ENVIRONMENT": "Development"
16+
"IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
17+
"ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)",
18+
"ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
19+
"ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
20+
"LAUNCHER_ARGS": "$(TargetPath)",
21+
"ASPNETCORE_ENVIRONMENT": "Development",
22+
"LAUNCHER_PATH": "$(DotNetPath)",
23+
"ASPNETCORE_MODULE_DEBUG": "console"
1624
}
1725
},
18-
"MusicStore": {
19-
"commandName": "Project",
20-
"launchBrowser": true,
21-
"launchUrl": "http://localhost:5000/",
26+
"ANCM IIS": {
27+
"commandName": "Executable",
28+
"executablePath": "$(IISPath)",
29+
"commandLineArgs": "$(IISArguments)",
2230
"environmentVariables": {
23-
"ASPNETCORE_ENVIRONMENT": "Development"
31+
"IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
32+
"ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)",
33+
"ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
34+
"ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
35+
"LAUNCHER_ARGS": "$(TargetPath)",
36+
"ASPNETCORE_ENVIRONMENT": "Development",
37+
"LAUNCHER_PATH": "$(DotNetPath)",
38+
"ASPNETCORE_MODULE_DEBUG": "console"
2439
}
2540
}
2641
}
27-
}
42+
}

‎src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
@@ -15,20 +15,20 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
20-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="$(MicrosoftAspNetCoreIdentityPackageVersion)" />
21-
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftAspNetCoreServerIntegrationTestingIISPackageVersion)" />
22-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
23-
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
29-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
31-
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
18+
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
19+
<Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
20+
<Reference Include="Microsoft.AspNetCore.Identity" />
21+
<Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" />
22+
<Reference Include="Microsoft.AspNetCore.WebUtilities" />
23+
<Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
24+
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
25+
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
26+
<Reference Include="Microsoft.Extensions.Configuration.Json" />
27+
<Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
28+
<Reference Include="Microsoft.Extensions.Logging.Console" />
29+
<Reference Include="Microsoft.Extensions.Logging" />
30+
<Reference Include="Microsoft.Extensions.Logging.Testing" />
31+
<Reference Include="System.Data.SqlClient" />
3232
</ItemGroup>
3333

3434
</Project>

0 commit comments

Comments
 (0)