Skip to content

Commit 66ae2ba

Browse files
rynowakrynowak
authored
Merge branch 'master' into merge/release/5.0-preview3-to-master
2 parents 39a2422 + 8fac707 commit 66ae2ba

File tree

210 files changed

+7505
-1421
lines changed

Some content is hidden

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

210 files changed

+7505
-1421
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ variables:
7171
# The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
7272
- name: _PublishArgs
7373
value: /p:Publish=true
74+
/p:GenerateChecksums=true
7475
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
7576
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
7677
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
@@ -594,7 +595,7 @@ stages:
594595
parameters:
595596
condition: ne(variables['SkipTests'], 'true')
596597
jobName: MacOS_Test
597-
jobDisplayName: "Test: macOS 10.13"
598+
jobDisplayName: "Test: macOS 10.14"
598599
agentOs: macOS
599600
isTestingJob: true
600601
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)

‎.vsconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.Net.Component.4.6.1.TargetingPack",
5+
"Microsoft.Net.Component.4.7.2.SDK",
6+
"Microsoft.Net.Component.4.7.2.TargetingPack",
7+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
8+
"Microsoft.VisualStudio.Workload.NetCoreTools",
9+
"Microsoft.VisualStudio.Workload.NetWeb",
10+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
11+
]
12+
}

‎CODE-OF-CONDUCT.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

‎Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@
179179

180180
<ArchiveExtension>.tar.gz</ArchiveExtension>
181181
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
182-
<ChecksumExtension>.sha512</ChecksumExtension>
183182
</PropertyGroup>
184183

185184
<Import Project="eng\Workarounds.props" />

‎Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@
105105
<SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
106106
</PropertyGroup>
107107

108+
<PropertyGroup>
109+
<PackageThirdPartyNoticesFile Condition="'$(PackageThirdPartyNoticesFile)' == ''">$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
110+
</PropertyGroup>
111+
112+
<ItemGroup Condition="'$(IsPackable)' == 'true'">
113+
<None Include="$(PackageThirdPartyNoticesFile)" Pack="true" PackagePath="." />
114+
</ItemGroup>
115+
108116
<ItemGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
109117
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
110118
</ItemGroup>

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Follow the [Getting Started](https://docs.microsoft.com/aspnet/core/getting-star
99

1010
Also check out the [.NET Homepage](https://www.microsoft.com/net) for released versions of .NET, getting started guides, and learning resources.
1111

12-
See the [Issue Management Policies](https://github.com/dotnet/aspnetcore/blob/anurse/issue-policies/docs/IssueManagementPolicies.md) document for more information on how we handle incoming issues.
12+
See the [Issue Management Policies](https://github.com/dotnet/aspnetcore/blob/master/docs/IssueManagementPolicies.md) document for more information on how we handle incoming issues.
1313

1414
## How to Engage, Contribute, and Give Feedback
1515

@@ -37,4 +37,4 @@ These are some other repos for related projects:
3737

3838
## Code of conduct
3939

40-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
40+
See [CODE-OF-CONDUCT](./CODE-OF-CONDUCT.md)

‎eng/AfterSigning.targets

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
3+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
4+
5+
<PropertyGroup Condition="'$(GenerateChecksums)' == 'true'">
6+
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
7+
<ArtifactsDir Condition=" HasTrailingSlash('$(ArtifactsDir)') ">$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
8+
<!-- $(InstallersOutputPath) is not defined. Root Directory.Build.props is not imported. -->
9+
<InstallersOutputPath>$(ArtifactsDir)\installers\</InstallersOutputPath>
10+
</PropertyGroup>
11+
12+
<Target Name="PopulateGenerateChecksumItems"
13+
Condition="'$(GenerateChecksums)' == 'true'"
14+
AfterTargets="Build"
15+
BeforeTargets="GenerateChecksums" >
16+
17+
<ItemGroup>
18+
<InstallerFiles Include="$(InstallersOutputPath)**\*.msi" />
19+
<InstallerFiles Include="$(InstallersOutputPath)**\*.exe" />
20+
<InstallerFiles Include="$(InstallersOutputPath)**\*.zip" />
21+
<InstallerFiles Include="$(InstallersOutputPath)**\*.tar.gz" />
22+
<InstallerFiles Include="$(InstallersOutputPath)**\*.wixlib" />
23+
<InstallerFiles Include="$(InstallersOutputPath)**\*.rpm" />
24+
<GenerateChecksumItems Include="%(InstallerFiles.Identity)" >
25+
<DestinationPath>%(FullPath).sha512</DestinationPath>
26+
</GenerateChecksumItems>
27+
</ItemGroup>
28+
29+
</Target>
30+
31+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
32+
33+
</Project>

‎eng/Baseline.Designer.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
</PropertyGroup>
77
<!-- Package: AspNetCoreRuntime.3.0.x64-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' ">
9-
<BaselinePackageVersion>3.0.2</BaselinePackageVersion>
9+
<BaselinePackageVersion>3.0.3</BaselinePackageVersion>
1010
</PropertyGroup>
1111
<ItemGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' AND '$(TargetFramework)' == 'net461' " />
1212
<!-- Package: AspNetCoreRuntime.3.0.x86-->
1313
<PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x86' ">
14-
<BaselinePackageVersion>3.0.2</BaselinePackageVersion>
14+
<BaselinePackageVersion>3.0.3</BaselinePackageVersion>
1515
</PropertyGroup>
1616
<ItemGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x86' AND '$(TargetFramework)' == 'net461' " />
1717
<!-- Package: dotnet-sql-cache-->

‎eng/Baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Update this list when preparing for a new patch.
55
66
-->
77
<Baseline Version="3.1.3">
8-
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.2" />
9-
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.2" />
8+
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
9+
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
1010
<Package Id="dotnet-sql-cache" Version="3.1.3" />
1111
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.3" />
1212
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.3" />

‎eng/Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
$(RepoRoot)src\SiteExtensions\LoggingAggregate\test\**\*.csproj;
153153
$(RepoRoot)src\Shared\**\*.*proj;
154154
$(RepoRoot)src\Tools\**\*.*proj;
155+
$(RepoRoot)src\Logging.AzureAppServices\**\src\*.csproj;
155156
$(RepoRoot)src\Middleware\**\*.csproj;
156157
$(RepoRoot)src\Razor\**\*.*proj;
157158
$(RepoRoot)src\Mvc\**\*.*proj;
@@ -191,6 +192,7 @@
191192
$(RepoRoot)src\Security\**\src\*.csproj;
192193
$(RepoRoot)src\SiteExtensions\**\src\*.csproj;
193194
$(RepoRoot)src\Tools\**\src\*.csproj;
195+
$(RepoRoot)src\Logging.AzureAppServices\**\src\*.csproj;
194196
$(RepoRoot)src\Middleware\**\src\*.csproj;
195197
$(RepoRoot)src\Razor\**\src\*.csproj;
196198
$(RepoRoot)src\Mvc\**\src\*.csproj;

‎eng/Dependencies.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ and are generated based on the last package release.
2929
<LatestPackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftCodeAnalysisRazorPackageVersion)" />
3030
<LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
3131
<LatestPackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
32-
<LatestPackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
3332
<LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
3433
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
3534
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
@@ -120,8 +119,6 @@ and are generated based on the last package release.
120119
<LatestPackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" />
121120
<LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
122121
<LatestPackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsCachingStackExchangeRedisPackageVersion)" />
123-
<LatestPackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
124-
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
125122
<LatestPackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />
126123
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion)" />
127124
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="$(MicrosoftIdentityModelProtocolsWsFederationPackageVersion)" />

‎eng/ProjectReferences.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Tools\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj" />
3333
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
3434
<ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj" />
35+
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.AzureAppServices" ProjectPath="$(RepoRoot)src\Logging.AzureAppServices\src\Microsoft.Extensions.Logging.AzureAppServices.csproj" />
3536
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ConcurrencyLimiter" ProjectPath="$(RepoRoot)src\Middleware\ConcurrencyLimiter\src\Microsoft.AspNetCore.ConcurrencyLimiter.csproj" />
3637
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" ProjectPath="$(RepoRoot)src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
3738
<ProjectReferenceProvider Include="Microsoft.AspNetCore.HeaderPropagation" ProjectPath="$(RepoRoot)src\Middleware\HeaderPropagation\src\Microsoft.AspNetCore.HeaderPropagation.csproj" />

‎eng/Publishing.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
2-
<PropertyGroup Condition=" HasTrailingSlash('$(ArtifactsDir)') ">
2+
<PropertyGroup>
33
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
4-
<ArtifactsDir>$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
4+
<ArtifactsDir Condition=" HasTrailingSlash('$(ArtifactsDir)') ">$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
55

66
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallersAndChecksums</PublishDependsOnTargets>
77

@@ -50,12 +50,10 @@
5050
<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
5151
<ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
5252

53-
<!-- Skip publishing checksums for now - the checksums for the .zip files don't match (https://github.com/dotnet/aspnetcore/issues/18792)
5453
<ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
5554
<PublishFlatContainer>true</PublishFlatContainer>
5655
<RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
5756
</ItemsToPushToBlobFeed>
58-
-->
5957

6058
<ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
6159
<IsShipping>true</IsShipping>

0 commit comments

Comments
 (0)