Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 56cdd09

Browse files
SteveSandersonMSSteveSandersonMS
committed
Respond to csproj migration code review feedback
1 parent aa18c49 commit 56cdd09

File tree

25 files changed

+64
-406
lines changed

25 files changed

+64
-406
lines changed

‎JavaScriptServices.sln‎

Lines changed: 0 additions & 156 deletions
Large diffs are not rendered by default.

‎global.json‎

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

‎samples/angular/MusicStore/MusicStore.csproj‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,20 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>MusicStore</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
95
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<IsPackable>false</IsPackable>
107
</PropertyGroup>
118

12-
<ItemGroup>
13-
<Content Update="appsettings.json;ClientApp;node_modules;typings\**\*;Views\**\*;tsconfig.json;tsd.json;web.config;webpack.*.js;wwwroot\**\*">
14-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
15-
</Content>
16-
</ItemGroup>
17-
189
<ItemGroup>
1910
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.csproj" />
2011
</ItemGroup>
2112

2213
<ItemGroup>
23-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
14+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
2415
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
2516
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
26-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
2817
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
2918
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="1.1.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.0" />
33-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.0" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
3519
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
3620
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
3721
<PackageReference Include="AutoMapper" Version="5.0.2" />

‎samples/misc/LatencyTest/LatencyTest.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<OutputType>Exe</OutputType>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>NodeServicesExamples</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>NodeServicesExamples</PackageId>
9-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
105
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<IsPackable>false</IsPackable>
117
</PropertyGroup>
128

139
<ItemGroup>
1410
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
1511
</ItemGroup>
1612

17-
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
2015
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.1.0" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
2316
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
2617
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
2718
</ItemGroup>
2819

‎samples/misc/Webpack/Webpack.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>Webpack</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>Webpack</PackageId>
9-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
105
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<IsPackable>false</IsPackable>
117
</PropertyGroup>
128

139
<ItemGroup>
1410
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj" />
1511
</ItemGroup>
1612

1713
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
14+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
2015
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.1.0" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
2316
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
2617
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
2718
</ItemGroup>
2819

‎samples/react/MusicStore/MusicStore.csproj‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>MusicStore</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>MusicStore</PackageId>
9-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
105
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<IsPackable>false</IsPackable>
117
</PropertyGroup>
128

139
<ItemGroup>
1410
<Compile Remove="node_modules\**\*" />
15-
<Content Update="appsettings.json;ClientApp\dist;node_modules\**\*;Views\**\*;web.config;wwwroot\**\*">
16-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
17-
</Content>
1811
</ItemGroup>
1912

2013
<ItemGroup>
2114
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.csproj" />
2215
</ItemGroup>
2316

2417
<ItemGroup>
25-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
18+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
2619
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
2720
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
28-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
29-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
3021
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
3122
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="1.1.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.0" />
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.0" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
3723
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
3824
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
3925
<PackageReference Include="AutoMapper" Version="5.0.2" />

‎samples/react/ReactGrid/ReactGrid.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>ReactGrid</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>ReactGrid</PackageId>
9-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
105
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<IsPackable>false</IsPackable>
117
</PropertyGroup>
128

139
<ItemGroup>
1410
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.csproj" />
1511
</ItemGroup>
1612

1713
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
14+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
2116
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
2217
</ItemGroup>
2318

‎src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj‎

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

3+
<Import Project="..\common.props" />
4+
35
<PropertyGroup>
46
<Description>Helpers for building Angular 2 applications on ASP.NET Core.</Description>
5-
<VersionPrefix>1.1.0-beta2</VersionPrefix>
6-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<AssemblyName>Microsoft.AspNetCore.AngularServices</AssemblyName>
10-
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
11-
<SignAssembly>true</SignAssembly>
12-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
13-
<PackageId>Microsoft.AspNetCore.AngularServices</PackageId>
7+
<VersionPrefix>1.1.0</VersionPrefix>
8+
<VersionSuffix>beta2</VersionSuffix>
149
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
15-
<RepositoryType>git</RepositoryType>
16-
<RepositoryUrl>git://github.com/aspnet/javascriptservices</RepositoryUrl>
17-
<NetStandardImplicitPackageVersion>1.6.1-*</NetStandardImplicitPackageVersion>
18-
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
19-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
20-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
21-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2210
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
2311
</PropertyGroup>
2412

@@ -30,9 +18,4 @@
3018
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.1.0" />
3119
</ItemGroup>
3220

33-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
34-
<Reference Include="System" />
35-
<Reference Include="Microsoft.CSharp" />
36-
</ItemGroup>
37-
3821
</Project>

‎src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs‎

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

0 commit comments

Comments
 (0)