Skip to content

Commit f676c24

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from 3 repositories (#12977)
* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190807.3 - Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19407.3 - Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19407.3 - dotnet-ef - 5.0.0-alpha1.19407.3 - Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19407.3 - Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19407.3 - Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19407.3 - Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19407.3 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Bcl.AsyncInterfaces - 1.1.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19404.5 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.CSharp - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.Registry - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 1.8.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19404.5 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19404.5 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-alpha1.19404.5 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19381.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19406.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19406-05 (parent: Microsoft.Extensions.Logging) * First pass at fixing netcoreapp5.0 errors * Add NETCoreAppMaximumVersion, remove BundledNETCorePlatformsPackageVersion * Apply KnownFrameworkReference Workaround * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190808.17 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19408.17 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19408.17 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19408.17 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19408.17 * Update TFMs to 5.0 * Retarget TFMs to netcoreapp5.0 * Change compile items from netcoreapp3.0.cs to netcoreapp5.0.cs * Rename netcoreapp3.0.cs files to netcoreapp5.0.cs * Update TargetFrameworks, Conditions * Fix missed items * Clean up remaining items in src * Fix missed merge conflict * Set TFMNetCoreMajor/MinorVersions to 5.0 * Rename missed .cs file, update ifdefs * Rename missed .cs file, update ifdefs * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190809.3 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19409.3 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19409.3 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19409.3 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19409.3 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190810.1 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19410.1 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19410.1 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19410.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19410.1 * Use default value for 5.0 TFM * NETCOREAPP5_0 -> NETCOREAPP * attempt to fix npm build * Update TFM reverted by merge * Explictly reference netcoreapp5.0 in repotasks.tasks * Regenerate ref assemblies * Consolidate FrameworkReference workarounds * Add workaround back to d.b.t * Regen ref assemblies * regen blazor.server.js * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190813.2 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19413.2 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19413.2 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19413.2 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19413.2 * Update dependencies from https://github.com/aspnet/Blazor build 20190813.1 - Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19413.1 * Exclude blazor.server.js from code check * start fixing tests * Bump test TFMs to 5.0 * Regen ref assemblies, hardcode TFM in dotnet-watch tests * Regenerate SpaServices.Extensions.netcoreapp.5.0.cs * Fix dotnet-watch csproj TFMs * Fixup 3.0 -> 5.0 files from merge * Fixup another set of 3.0 -> 5.0 misses * More 3.0 -> 5,9 * More 3.0 -> 5.0 madness * Set TargetFramework for test templates * Disable warning in ApiAuth tests * Put TFM in right place * Hardcode TFM * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190814.4 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19414.4 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19414.4 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19414.4 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19414.4 * Regen ref assemblies * Hardcode TFM for template tests * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190815.9 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19415.9 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19415.9 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19415.9 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19415.9 * Apply AppHostPack/FrameworkRef workaround to dotnet-watch tests * Set KnownAppHost/KnownFramework after sdk.targets import * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190816.3 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19416.3 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19416.3 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19416.3 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19416.3 * Update dependencies from https://github.com/aspnet/Blazor build 20190816.2 - Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19416.2 * More workaround * Try workaround for template tests * Update to 5.0 SDK * Remove AppHostPack workaround * Remove more workarounds * Try updating RazorLangVersion * Try adding FrameworkReference workaround back * Remove framework and revert RazorLang to 3.0 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190819.4 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19419.4 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19419.4 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19419.4 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19419.4 * Update dependencies from https://github.com/aspnet/Blazor build 20190819.1 - Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19419.1 * Set env var * Add 1 workaround back for SourceBuild * Remove workaround from Project Template tests * Add back maxVersion workaround for sourcebuild * One more source build workaround * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190821.3 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19421.3 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19421.3 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19421.3 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19421.3 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190822.9 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19422.9 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19422.9 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19422.9 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19422.9 * Remove workaround for Razor 3.0 SDK * Fix Blazor SDK error in SourceBuild * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190822.15 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19422.15 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19422.15 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19422.15 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19422.15 * Update dependencies from https://github.com/aspnet/Blazor build 20190822.1 - Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19422.1 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190824.6 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19424.6 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19424.6 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19424.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19424.6 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190825.1 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19425.1 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19425.1 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19425.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19425.1 * Rename netcoreapp5.0.cs files to netcoreapp.cs * Fix inverted condition for Razor projects * Apply Razor logic consistently * Catch netcoreapp2.0.cs file in codecheck * Remove ref:suppressField * Reenable workarounds for Razor projects * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190826.2 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19426.2 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19426.2 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19426.2 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19426.2 * Update dependencies from https://github.com/aspnet/Blazor build 20190826.2 - Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19426.2 * React to ref:suppressField breaking changes * Stop using custom version of SDK in source build * Remove SourceBuild workarounds * Skip template tests
1 parent e9179ba commit f676c24

File tree

766 files changed

+1280
-1313
lines changed

Some content is hidden

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

766 files changed

+1280
-1313
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -504,16 +504,6 @@ jobs:
504504
chmod +x $HOME/bin/jq
505505
echo "##vso[task.prependpath]$HOME/bin"
506506
displayName: Install jq
507-
- task: UseDotNet@2
508-
displayName: 'Use .NET Core sdk'
509-
inputs:
510-
packageType: sdk
511-
# The SDK version selected here is intentionally supposed to use the latest release
512-
# For the purpose of building Linux distros, we can't depend on features of the SDK
513-
# which may not exist in pre-built versions of the SDK
514-
version: 3.0.x
515-
installationPath: $(DotNetCoreSdkDir)
516-
includePreviewVersions: true
517507
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
518508
displayName: Run ci-source-build.sh
519509
- task: PublishBuildArtifacts@1

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<IncludeSymbols>true</IncludeSymbols>
4545

46-
<DefaultNetCoreTargetFramework>netcoreapp$(TFMNetCoreMajorVersion).$(TFMNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
46+
<DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
4747
</PropertyGroup>
4848

4949
<!-- Warnings and errors -->

‎eng/PublishSymbols.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="RunPublishSymbols">
22
<PropertyGroup>
33
<!-- TFM doesn't matter. These settings are required to make NuGet happy so we can restore required MSBuild packages. -->
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
66
<ManifestsPath>artifacts\manifests\</ManifestsPath>
77
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>

‎eng/SharedFramework.External.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
108108
is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
109109
-->
110-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' or $(TargetFrameworks.Contains('netcoreapp3.0'))">
110+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
111111
<_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
112112
<_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
113113
<_CompilationOnlyReference Include="System.Security.Principal.Windows" />

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 101 additions & 106 deletions
Large diffs are not rendered by default.

‎eng/Workarounds.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
<Reference Include="Microsoft.AspNetCore.Mvc" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(GenerateRazorAssemblyInfo)' == 'true'" />
1111
</ItemGroup>
1212

13-
<!-- Workaround https://github.com/dotnet/cli/issues/10528 -->
14-
<PropertyGroup>
15-
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
16-
</PropertyGroup>
17-
1813
<!-- Workaround https://github.com/aspnet/AspNetCore/issues/7503. This chains GenerateSourceLinkFile before razor component targets run. -->
1914
<!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so do not apply this worksaround. -->
2015
<Target Condition="'$(DotNetBuildFromSource)' != 'true'"

‎eng/common/performance/performance-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Param(
22
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
33
[string] $CoreRootDirectory,
44
[string] $Architecture="x64",
5-
[string] $Framework="netcoreapp3.0",
5+
[string] $Framework="netcoreapp5.0",
66
[string] $CompilationMode="Tiered",
77
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
88
[string] $Branch=$env:BUILD_SOURCEBRANCH,

‎eng/common/performance/performance-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source_directory=$BUILD_SOURCESDIRECTORY
44
core_root_directory=
55
architecture=x64
6-
framework=netcoreapp3.0
6+
framework=netcoreapp5.0
77
compilation_mode=tiered
88
repository=$BUILD_REPOSITORY_NAME
99
branch=$BUILD_SOURCEBRANCH

‎eng/scripts/CodeCheck.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ try {
177177
if ($changedFiles) {
178178
foreach ($file in $changedFiles) {
179179
if ($file -eq $changedFilesExclusion) {continue}
180-
181180
$filePath = Resolve-Path "${repoRoot}/${file}"
182181
LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath
183182
& git --no-pager diff --ignore-space-at-eol $filePath

‎eng/scripts/ci-source-build.sh

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@ set -euo pipefail
99
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1010
reporoot="$(dirname "$(dirname "$scriptroot")")"
1111

12-
# For local development, make a backup copy of this file first
13-
if [ ! -f "$reporoot/global.bak.json" ]; then
14-
mv "$reporoot/global.json" "$reporoot/global.bak.json"
15-
fi
16-
17-
# Detect the current version of .NET Core installed
18-
export SDK_VERSION=$(dotnet --version)
19-
echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
20-
21-
# Update the global.json file to match the current .NET environment
22-
cat "$reporoot/global.bak.json" | \
23-
jq '.sdk.version=env.SDK_VERSION' | \
24-
jq '.tools.dotnet=env.SDK_VERSION' | \
25-
jq 'del(.tools.runtimes)' \
26-
> "$reporoot/global.json"
27-
28-
# Restore the original global.json file
29-
trap "{
30-
mv "$reporoot/global.bak.json" "$reporoot/global.json"
31-
}" EXIT
32-
3312
export DotNetBuildFromSource='true'
3413

3514
# Build repo tasks

‎eng/targets/ReferenceAssembly.targets

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@
4545

4646
<Target Name="_GenerateProjectSourceInner" Returns="@(ProjectListContent)" DependsOnTargets="Build" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
4747
<PropertyGroup>
48+
<_RefSourceFileTFM>$(TargetFramework)</_RefSourceFileTFM>
49+
<_RefSourceFileTFM Condition="$(TargetFramework.StartsWith('netcoreapp'))">netcoreapp</_RefSourceFileTFM>
50+
4851
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
49-
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
52+
<_RefSourceFileName>$(AssemblyName).$(_RefSourceFileTFM).cs</_RefSourceFileName>
5053
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
5154
</PropertyGroup>
5255

‎eng/tools/BaselineGenerator/BaselineGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<StartArguments>-s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</StartArguments>
77
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
88
</PropertyGroup>

‎eng/tools/Maestro/Maestro.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- TFM doesn't matter. These settings are required to make NuGet happy so we can restore required MSBuild packages. -->
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
77
<ManifestsPath>$(ArtifactsDir)manifests\</ManifestsPath>
88
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>

‎eng/tools/RepoTasks/RepoTasks.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
66
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
77
<Optimize>false</Optimize>
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
19+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
2020
<PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
2121
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
2222
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />

‎eng/tools/RepoTasks/RepoTasks.tasks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">netcoreapp3.0</_RepoTaskAssemblyFolder>
3+
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">netcoreapp5.0</_RepoTaskAssemblyFolder>
44
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
55
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
66
</PropertyGroup>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview7-012821"
3+
"version": "5.0.100-alpha1-013788"
44
},
55
"tools": {
6-
"dotnet": "3.0.100-preview7-012821",
6+
"dotnet": "5.0.100-alpha1-013788",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppRuntimeVersion)"

‎src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
77

‎src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
7-
<Compile Include="Microsoft.AspNetCore.Antiforgery.netcoreapp3.0.cs" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
7+
<Compile Include="Microsoft.AspNetCore.Antiforgery.netcoreapp.cs" />
88
<Reference Include="Microsoft.AspNetCore.DataProtection" />
99
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1010
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />

‎src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.netcoreapp3.0.cs renamed to ‎src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.netcoreapp.cs

File renamed without changes.

‎src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks.</Description>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<IsAspNetCoreApp>true</IsAspNetCoreApp>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;antiforgery</PackageTags>

‎src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
7-
<Compile Include="Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
7+
<Compile Include="Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp.cs" />
88
<Reference Include="Microsoft.AspNetCore.Mvc" />
99
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1010
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />

‎src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs renamed to ‎src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp.cs

File renamed without changes.

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>ASP.NET Core Azure Active Directory Integration provides components for easily integrating Azure Active Directory authentication within your ASP.NET Core application.</Description>
55
<RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory Integration package.</RazorAssemblyDescription>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
77
<PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<IsShippingPackage>true</IsShippingPackage>

‎src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureAD.UI</RootNamespace>
66
</PropertyGroup>
77

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
7-
<Compile Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
7+
<Compile Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs" />
88
<Reference Include="Microsoft.AspNetCore.Mvc" />
99
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1010
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs renamed to ‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs

File renamed without changes.

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>ASP.NET Core Azure Active Directory B2C Integration provides components for easily integrating Azure Active Directory B2C authentication within your ASP.NET Core application.</Description>
55
<RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory B2C Integration package.</RazorAssemblyDescription>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
77
<PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<IsShippingPackage>true</IsShippingPackage>

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureADB2C.UI</RootNamespace>
66
</PropertyGroup>
77

‎src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<!-- Test asset publishing not working on arm64 https://github.com/aspnet/AspNetCore/issues/11205 -->
66
<SkipHelixArm>true</SkipHelixArm>
77
</PropertyGroup>
@@ -21,7 +21,7 @@
2121

2222
<Target Name="PublishAssets" AfterTargets="Publish">
2323
<ItemGroup>
24-
<_PublishFiles Include="$(ArtifactsBinDir)AzureAD.WebSite\$(Configuration)\netcoreapp3.0\AzureAD.WebSite.deps.json" />
24+
<_PublishFiles Include="$(ArtifactsBinDir)AzureAD.WebSite\$(Configuration)\$(DefaultNetCoreTargetFramework)\AzureAD.WebSite.deps.json" />
2525
</ItemGroup>
2626
<Copy
2727
SourceFiles="@(_PublishFiles)"

‎src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
7-
<Compile Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
7+
<Compile Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp.cs" />
88
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
99
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
1010
</ItemGroup>

‎src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs renamed to ‎src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp.cs

File renamed without changes.

‎src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>ASP.NET Core lightup integration with Azure AppServices.</Description>
7-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
7+
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;azure;appservices</PackageTags>
1010
<IsShippingPackage>true</IsShippingPackage>

‎src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
7-
<Compile Include="Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
7+
<Compile Include="Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp.cs" />
88
<Reference Include="Microsoft.AspNetCore.Hosting" />
99
<Reference Include="Microsoft.Extensions.Logging.AzureAppServices" />
1010
</ItemGroup>

‎src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs renamed to ‎src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp.cs

File renamed without changes.

‎src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>ASP.NET Core integration with Azure AppServices.</Description>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)