Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit 3db604d

Browse files
natemcmasternatemcmaster
authored
Upgrade packages and projects to target netcoreapp3.0 (except the .NET signalr client) (#3315)
1 parent cdd7387 commit 3db604d

File tree

48 files changed

+159
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+159
-159
lines changed

‎Directory.Build.targets

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
4-
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
5-
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
64
</PropertyGroup>
75
</Project>

‎benchmarkapps/BenchmarkServer/BenchmarkServer.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<!-- SignalR is versioned 1.0 alongside the 2.1 version of AspNetCore.All, this converts the .All version to the SignalR version -->
6-
<MessagePackPackageVersion Condition=" '$(BenchmarksTargetFramework)' != '' ">$([System.String]::Copy($(MicrosoftAspNetCoreAllPackageVersion)).Replace('2.2', '1.1'))</MessagePackPackageVersion>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
75
</PropertyGroup>
86

97
<ItemGroup>
@@ -23,8 +21,8 @@
2321

2422
<!-- These references are used when running on the Benchmarks Server -->
2523
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
26-
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
27-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="$(MessagePackPackageVersion)" />
24+
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
25+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
2826
</ItemGroup>
2927

3028
</Project>

‎benchmarkapps/Crankier/Crankier.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66
<RootNamespace>Microsoft.AspNetCore.SignalR.CranksRevenge</RootNamespace>
77
</PropertyGroup>
88

‎benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎build/dependencies.props

+46-46
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,58 @@
55
<PropertyGroup Label="Package Versions">
66
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
77
<GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion>
8-
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181108-06</InternalAspNetCoreAnalyzersPackageVersion>
9-
<InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181011.3</InternalAspNetCoreSdkPackageVersion>
8+
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181113-11</InternalAspNetCoreAnalyzersPackageVersion>
9+
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
1010
<MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
11-
<MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10660</MicrosoftAspNetCoreAllPackageVersion>
12-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
13-
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
14-
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
15-
<MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreAuthorizationPackageVersion>
16-
<MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>
17-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
18-
<MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
19-
<MicrosoftAspNetCoreCorsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreCorsPackageVersion>
20-
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
21-
<MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreDiagnosticsPackageVersion>
22-
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
23-
<MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreHostingPackageVersion>
24-
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
25-
<MicrosoftAspNetCoreHttpFeaturesPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreHttpFeaturesPackageVersion>
26-
<MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreHttpPackageVersion>
27-
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
28-
<MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreMvcPackageVersion>
29-
<MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreRoutingPackageVersion>
30-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
31-
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreServerKestrelPackageVersion>
32-
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreStaticFilesPackageVersion>
33-
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreTestHostPackageVersion>
34-
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181108-06</MicrosoftAspNetCoreTestingPackageVersion>
35-
<MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10727</MicrosoftAspNetCoreWebSocketsPackageVersion>
11+
<MicrosoftAspNetCoreAppPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAppPackageVersion>
12+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
13+
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
14+
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
15+
<MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthorizationPackageVersion>
16+
<MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>
17+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
18+
<MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
19+
<MicrosoftAspNetCoreCorsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreCorsPackageVersion>
20+
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
21+
<MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
22+
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
23+
<MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
24+
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
25+
<MicrosoftAspNetCoreHttpFeaturesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpFeaturesPackageVersion>
26+
<MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpPackageVersion>
27+
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
28+
<MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
29+
<MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRoutingPackageVersion>
30+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
31+
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
32+
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
33+
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
34+
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreTestingPackageVersion>
35+
<MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreWebSocketsPackageVersion>
3636
<MicrosoftCSharpPackageVersion>4.6.0-preview1-26907-04</MicrosoftCSharpPackageVersion>
3737
<MicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreDesignPackageVersion>
3838
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
3939
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreToolsPackageVersion>
4040
<MicrosoftExtensionsBuffersTestingSourcesPackageVersion>3.0.0-alpha1-10727</MicrosoftExtensionsBuffersTestingSourcesPackageVersion>
41-
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
42-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
43-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
44-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
45-
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
46-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
47-
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsDependencyInjectionPackageVersion>
48-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
49-
<MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingConfigurationPackageVersion>
50-
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingConsolePackageVersion>
51-
<MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingDebugPackageVersion>
52-
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingPackageVersion>
53-
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsLoggingTestingPackageVersion>
54-
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
55-
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsOptionsPackageVersion>
56-
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
57-
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
58-
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181108-06</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
59-
<MicrosoftNETCoreApp22PackageVersion>2.2.0-rtm-27105-02</MicrosoftNETCoreApp22PackageVersion>
41+
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
42+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
43+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
44+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
45+
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
46+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
47+
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
48+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
49+
<MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
50+
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
51+
<MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
52+
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingPackageVersion>
53+
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
54+
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
55+
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
56+
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
57+
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
58+
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
59+
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
6060
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
6161
<MoqPackageVersion>4.10.0</MoqPackageVersion>
6262
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>

‎build/publish-apps.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
param($RootDirectory = (Get-Location), $Framework = "netcoreapp2.2", $Runtime = "win7-x64", $CommitHash, $BranchName, $BuildNumber)
1+
param($RootDirectory = (Get-Location), $Framework = "netcoreapp3.0", $Runtime = "win7-x64", $CommitHash, $BranchName, $BuildNumber)
22

33
# De-Powershell the path
44
$RootDirectory = (Convert-Path $RootDirectory)
@@ -45,4 +45,4 @@ $Apps.Keys | ForEach-Object {
4545
} finally {
4646
Remove-Item $MetadataPath
4747
}
48-
}
48+
}

‎build/repo.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
22+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
2323
</ItemGroup>
2424
</Project>

‎clients/ts/FunctionalTests/FunctionalTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
66
<TypeScriptToolsVersion>2.8</TypeScriptToolsVersion>
77
</PropertyGroup>

‎clients/ts/FunctionalTests/package-lock.json

+21-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clients/ts/FunctionalTests/scripts/run-tests.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function runJest(httpsUrl: string, httpUrl: string) {
191191

192192
(async () => {
193193
try {
194-
const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp2.2", "FunctionalTests.dll");
194+
const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp3.0", "FunctionalTests.dll");
195195

196196
debug(`Launching Functional Test Server: ${serverPath}`);
197197
let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0";

0 commit comments

Comments
 (0)