Skip to content

Commit edfb2ab

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.2'
2 parents 9e0c93b + 0926b93 commit edfb2ab

File tree

61 files changed

+425
-1260
lines changed

Some content is hidden

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

61 files changed

+425
-1260
lines changed

‎.azure/pipelines/pr-validation-temp.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,11 @@ jobs:
2828
jobDisplayName: "Build only : Linux"
2929
agentOs: Linux
3030
buildArgs: --all --pack
31+
- job: Code_check
32+
displayName: Code check
33+
workspace:
34+
clean: all
35+
pool:
36+
vmImage: vs2017-win2016
37+
steps:
38+
- powershell: ./eng/scripts/CodeCheck.ps1 -ci

‎build/artifacts.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ This can be done once #4246 is complete, and done in conjunction with converting
9090
<!-- This package contains API for the .NET CLI to generate the aspnet HTTPs dev cert during CLI first-run initialization. -->
9191
<PackageArtifact Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Category="noship" />
9292

93-
<!-- This packages contain bits used by Azure site extensions, and are not currently deployed to NuGet.org automatically like the rest of our packages. -->
94-
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
95-
9693
<!-- This packages are produce for testing purposes only. -->
9794
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Category="noship" />
9895
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />

‎build/buildorder.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
</ItemDefinitionGroup>
88

99
<ItemGroup>
10-
<RepositoryBuildOrder Include="AzureIntegration" Order="15" />
1110
<RepositoryBuildOrder Include="MusicStore" Order="16" />
1211
<RepositoryBuildOrder Include="SignalR" Order="16" />
1312
<RepositoryBuildOrder Include="AuthSamples" Order="16" />

‎build/submodules.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<Repository Include="AzureIntegration" />
4039
<Repository Include="Components" />
4140
<Repository Include="SignalR" />
4241
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />

‎eng/Baseline.Designer.props‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,37 @@
4444
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
4545
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
4646
</ItemGroup>
47+
<!-- Package: Microsoft.AspNetCore.ApplicationInsights.HostingStartup-->
48+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' ">
49+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
50+
</PropertyGroup>
51+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'net461' ">
52+
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
53+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
54+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
55+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
56+
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
57+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
58+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
59+
</ItemGroup>
60+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
61+
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
62+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
63+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
64+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
65+
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
66+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
67+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
68+
</ItemGroup>
69+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
70+
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
71+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
72+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
73+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
74+
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
75+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
76+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
77+
</ItemGroup>
4778
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
4879
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
4980
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -187,6 +218,30 @@
187218
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
188219
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
189220
</ItemGroup>
221+
<!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup-->
222+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
223+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
224+
</PropertyGroup>
225+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'net461' ">
226+
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
227+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
228+
</ItemGroup>
229+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
230+
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
231+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
232+
</ItemGroup>
233+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
234+
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
235+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
236+
</ItemGroup>
237+
<!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration-->
238+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' ">
239+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
240+
</PropertyGroup>
241+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
242+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
243+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.0, )" />
244+
</ItemGroup>
190245
<!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
191246
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
192247
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>

‎eng/Baseline.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
1111
<Package Id="dotnet-watch" Version="2.2.0" />
1212
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
1313
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
14+
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
1415
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
1516
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
1617
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
@@ -29,6 +30,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
2930
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
3031
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
3132
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
33+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.0" />
34+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.0" />
3235
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
3336
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" />
3437
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />

‎eng/Dependencies.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ and are generated based on the last package release.
6868
<LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
6969
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
7070
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
71+
<LatestPackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
7172
<LatestPackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
7273
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
7374
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />

‎eng/ProjectReferences.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,7 @@
111111
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj" />
112112
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
113113
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
114+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
115+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServicesIntegration" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
114116
</ItemGroup>
115117
</Project>

‎eng/scripts/CodeCheck.ps1‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#requires -version 5
2+
<#
3+
.SYNOPSIS
4+
This script runs a quick check for common errors, such as checking that Visual Studio solutions are up to date or that generated code has been committed to source.
5+
#>
6+
param(
7+
[switch]$ci
8+
)
9+
10+
$ErrorActionPreference = 'Stop'
11+
Set-StrictMode -Version 1
12+
Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
13+
14+
$repoRoot = Resolve-Path "$PSScriptRoot/../../"
15+
16+
[string[]] $errors = @()
17+
18+
try {
19+
#
20+
# Solutions
21+
#
22+
23+
Write-Host "Checking that solutions are up to date"
24+
25+
Get-ChildItem "$repoRoot/*.sln" -Recurse | % {
26+
Write-Host " Checking $(Split-Path -Leaf $_)"
27+
$slnDir = Split-Path -Parent $_
28+
$sln = $_
29+
& dotnet sln $_ list `
30+
| ? { $_ -ne 'Project(s)' -and $_ -ne '----------' } `
31+
| % {
32+
$proj = Join-Path $slnDir $_
33+
if (-not (Test-Path $proj)) {
34+
$errors += "Missing project. Solution references a project which does not exist: $proj. [$sln] "
35+
}
36+
}
37+
}
38+
39+
#
40+
# Generated code check
41+
#
42+
43+
Write-Host "Re-running code generation"
44+
45+
Invoke-Block {
46+
[string[]] $generateArgs = @()
47+
if ($ci) {
48+
$generateArgs += '-ci'
49+
}
50+
& $repoRoot/build.cmd /t:GenerateProjectList @generateArgs
51+
}
52+
53+
Write-Host "git diff"
54+
& git diff --ignore-space-at-eol --exit-code
55+
if ($LastExitCode -ne 0) {
56+
$status = git status -s | Out-String
57+
$status = $status -replace "`n","`n "
58+
$errors += "Generated code is not up to date."
59+
}
60+
}
61+
finally {
62+
foreach ($err in $errors) {
63+
Write-Host -f Red "error : $err"
64+
}
65+
66+
if ($errors) {
67+
exit 1
68+
}
69+
}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "3.0.100-preview-009750"
44
},
55
"msbuild-sdks": {
6-
"Internal.AspNetCore.Sdk": "3.0.0-build-20181214.1"
6+
"Internal.AspNetCore.Sdk": "3.0.0-build-20190104.3"
77
}
88
}

0 commit comments

Comments
 (0)