Skip to content

[master] Update dependencies from 3 repositories #12977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 100 commits into from
Aug 28, 2019
Merged

[master] Update dependencies from 3 repositories #12977

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
d3b3e4e
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Aug 8, 2019
82b7039
First pass at fixing netcoreapp5.0 errors
wtgodbe Aug 8, 2019
34434fe
Add NETCoreAppMaximumVersion, remove BundledNETCorePlatformsPackageVe…
wtgodbe Aug 8, 2019
d82f803
Apply KnownFrameworkReference Workaround
wtgodbe Aug 8, 2019
507d8d7
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Aug 9, 2019
474dca4
Update TFMs to 5.0
wtgodbe Aug 9, 2019
2dd2765
Merge branch 'darc-master-32d14344-7a9b-47ca-83f6-eae3b6461017' of ht…
wtgodbe Aug 9, 2019
06451a4
Retarget TFMs to netcoreapp5.0
wtgodbe Aug 9, 2019
e3317dd
Change compile items from netcoreapp3.0.cs to netcoreapp5.0.cs
wtgodbe Aug 9, 2019
8885aaa
Rename netcoreapp3.0.cs files to netcoreapp5.0.cs
wtgodbe Aug 9, 2019
928c7db
Update TargetFrameworks, Conditions
wtgodbe Aug 9, 2019
4373452
Fix missed items
wtgodbe Aug 9, 2019
0b9f25e
Clean up remaining items in src
wtgodbe Aug 9, 2019
cde923c
Merge in master & resolve conflicts
wtgodbe Aug 9, 2019
a5e5c90
Fix missed merge conflict
wtgodbe Aug 9, 2019
abdb44d
Set TFMNetCoreMajor/MinorVersions to 5.0
wtgodbe Aug 9, 2019
36d6853
Rename missed .cs file, update ifdefs
wtgodbe Aug 9, 2019
e5ed62d
Rename missed .cs file, update ifdefs
wtgodbe Aug 9, 2019
de33639
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Aug 10, 2019
7feace4
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Aug 11, 2019
333b39f
Use default value for 5.0 TFM
wtgodbe Aug 12, 2019
7dd5d6e
NETCOREAPP5_0 -> NETCOREAPP
wtgodbe Aug 12, 2019
e5485e9
attempt to fix npm build
BrennanConroy Aug 12, 2019
43165f8
Merge master into branch
wtgodbe Aug 12, 2019
369560c
Merge branch 'darc-master-32d14344-7a9b-47ca-83f6-eae3b6461017' of ht…
wtgodbe Aug 12, 2019
6515f19
Update TFM reverted by merge
wtgodbe Aug 12, 2019
e69055e
Explictly reference netcoreapp5.0 in repotasks.tasks
wtgodbe Aug 12, 2019
b786c80
Regenerate ref assemblies
wtgodbe Aug 12, 2019
4ab11f5
Consolidate FrameworkReference workarounds
wtgodbe Aug 12, 2019
d58fe57
Add workaround back to d.b.t
wtgodbe Aug 12, 2019
238cd0a
Regen ref assemblies
wtgodbe Aug 13, 2019
43e7a0e
regen blazor.server.js
wtgodbe Aug 13, 2019
e42945b
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Aug 14, 2019
517c075
Update dependencies from https://github.com/aspnet/Blazor build 20190…
Aug 14, 2019
e9b105d
Exclude blazor.server.js from code check
wtgodbe Aug 14, 2019
0c5a358
start fixing tests
BrennanConroy Aug 14, 2019
6a3b913
Bump test TFMs to 5.0
wtgodbe Aug 14, 2019
bb217a1
Regen ref assemblies, hardcode TFM in dotnet-watch tests
wtgodbe Aug 14, 2019
2a7444f
Regenerate SpaServices.Extensions.netcoreapp.5.0.cs
wtgodbe Aug 14, 2019
c3d4bec
Merge master into branch
wtgodbe Aug 14, 2019
00042dc
Fix dotnet-watch csproj TFMs
wtgodbe Aug 14, 2019
8053ce7
Fixup 3.0 -> 5.0 files from merge
wtgodbe Aug 14, 2019
7f12b8e
Fixup another set of 3.0 -> 5.0 misses
wtgodbe Aug 14, 2019
1e60085
More 3.0 -> 5,9
wtgodbe Aug 14, 2019
25a7b93
More 3.0 -> 5.0 madness
wtgodbe Aug 14, 2019
70e518f
Set TargetFramework for test templates
wtgodbe Aug 14, 2019
5d5581e
Disable warning in ApiAuth tests
wtgodbe Aug 14, 2019
e728034
Put TFM in right place
wtgodbe Aug 14, 2019
05d44f4
Hardcode TFM
wtgodbe Aug 14, 2019
37196b4
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Aug 15, 2019
9d85671
Merge master
wtgodbe Aug 15, 2019
6800a1e
Regen ref assemblies
wtgodbe Aug 15, 2019
2ad9394
Hardcode TFM for template tests
wtgodbe Aug 15, 2019
0c5516f
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 16, 2019
701a778
Merge branch 'master' into darc-master-32d14344-7a9b-47ca-83f6-eae3b6…
BrennanConroy Aug 16, 2019
29ec861
Apply AppHostPack/FrameworkRef workaround to dotnet-watch tests
wtgodbe Aug 16, 2019
5fd3533
Merge branch 'darc-master-32d14344-7a9b-47ca-83f6-eae3b6461017' of ht…
wtgodbe Aug 16, 2019
f81ae19
Set KnownAppHost/KnownFramework after sdk.targets import
wtgodbe Aug 16, 2019
3f2cbc3
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 17, 2019
1c2afb0
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Aug 17, 2019
1f8d2d0
More workaround
wtgodbe Aug 19, 2019
92ca8f9
Try workaround for template tests
wtgodbe Aug 19, 2019
82b338d
Update to 5.0 SDK
wtgodbe Aug 19, 2019
3d2e486
Remove AppHostPack workaround
wtgodbe Aug 19, 2019
4edb3b5
Remove more workarounds
wtgodbe Aug 19, 2019
631e36a
Try updating RazorLangVersion
wtgodbe Aug 19, 2019
0b52967
Try adding FrameworkReference workaround back
wtgodbe Aug 19, 2019
0dbd8ea
Remove framework and revert RazorLang to 3.0
wtgodbe Aug 19, 2019
367c499
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 20, 2019
217d12a
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Aug 20, 2019
e0b5488
Set env var
wtgodbe Aug 20, 2019
4c533d3
Merge branch 'darc-master-32d14344-7a9b-47ca-83f6-eae3b6461017' of ht…
wtgodbe Aug 20, 2019
137cb0a
Add 1 workaround back for SourceBuild
wtgodbe Aug 20, 2019
5a671fc
Remove workaround from Project Template tests
wtgodbe Aug 20, 2019
407fae0
Add back maxVersion workaround for sourcebuild
wtgodbe Aug 20, 2019
d229ac3
One more source build workaround
wtgodbe Aug 20, 2019
bd41371
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 22, 2019
eb170d0
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 22, 2019
fa5161e
Remove workaround for Razor 3.0 SDK
wtgodbe Aug 22, 2019
65afebc
Merge branch 'darc-master-32d14344-7a9b-47ca-83f6-eae3b6461017' of ht…
wtgodbe Aug 22, 2019
c73dd01
Fix Blazor SDK error in SourceBuild
wtgodbe Aug 22, 2019
169a96b
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 23, 2019
e8ad5dc
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Aug 23, 2019
a51aedc
Merge branch 'master' into darc-master-32d14344-7a9b-47ca-83f6-eae3b6…
dougbu Aug 24, 2019
df80c28
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 25, 2019
1b48ed6
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 26, 2019
30eea7d
Rename netcoreapp5.0.cs files to netcoreapp.cs
wtgodbe Aug 26, 2019
80e88a7
Fix inverted condition for Razor projects
wtgodbe Aug 26, 2019
b946a81
Apply Razor logic consistently
wtgodbe Aug 26, 2019
7d77343
Catch netcoreapp2.0.cs file in codecheck
wtgodbe Aug 26, 2019
3b344f4
Remove ref:suppressField
pranavkm Aug 16, 2019
54fc370
Reenable workarounds for Razor projects
wtgodbe Aug 26, 2019
f9b4d48
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Aug 27, 2019
6d3a7d3
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Aug 27, 2019
2531919
Merge remote-tracking branch 'origin/master' into darc-master-32d1434…
wtgodbe Aug 27, 2019
cb4eeb3
React to ref:suppressField breaking changes
pranavkm Aug 27, 2019
9ae2545
Merge remote-tracking branch 'origin/master' into darc-master-32d1434…
wtgodbe Aug 27, 2019
fe0a258
Stop using custom version of SDK in source build
wtgodbe Aug 27, 2019
651376f
Remove SourceBuild workarounds
wtgodbe Aug 27, 2019
f9df9a3
Skip template tests
Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<IncludeSymbols>true</IncludeSymbols>

<DefaultNetCoreTargetFramework>netcoreapp$(TFMNetCoreMajorVersion).$(TFMNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
</PropertyGroup>

<!-- Warnings and errors -->
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@
</ItemGroup>

<ItemGroup>
<KnownFrameworkReference Update="Microsoft.NETCore.App">
<FrameworkReference Update="Microsoft.NETCore.App">
<!-- Always update the 'latest version', whether the repo is servicing or not. -->
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
<!-- Only update the default runtime version for preview builds. -->
<DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
<!-- Only update the targeting pack version for preview builds. -->
<TargetingPackVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
</KnownFrameworkReference>
</FrameworkReference>

<KnownFrameworkReference Condition="'$(UseAspNetCoreSharedRuntime)' != 'true'" Remove="Microsoft.AspNetCore.App" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
Expand Down
2 changes: 1 addition & 1 deletion eng/PublishSymbols.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="RunPublishSymbols">
<PropertyGroup>
<!-- TFM doesn't matter. These settings are required to make NuGet happy so we can restore required MSBuild packages. -->
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<ManifestsPath>artifacts\manifests\</ManifestsPath>
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
Expand Down
2 changes: 1 addition & 1 deletion eng/SharedFramework.External.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
-->
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
<_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
<_CompilationOnlyReference Include="System.Security.Principal.Windows" />
Expand Down
400 changes: 200 additions & 200 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

205 changes: 100 additions & 105 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions eng/Workarounds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Reference Include="Microsoft.AspNetCore.Mvc" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(GenerateRazorAssemblyInfo)' == 'true'" />
</ItemGroup>

<!-- Workaround https://github.com/dotnet/cli/issues/10528 -->
<!-- Workaround while there is no 5.0 SDK available, suppress unsupported version error -->
<PropertyGroup>
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
<NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
</PropertyGroup>

<!-- Workaround https://github.com/aspnet/AspNetCore/issues/7503. This chains GenerateSourceLinkFile before razor component targets run. -->
Expand All @@ -37,6 +37,18 @@
</KnownFrameworkReference>
</ItemGroup>

<!-- Workaround while there is no 5.0 SDK available, copy known apphost/framework reference info from 3.0 -->
<ItemGroup>
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="netcoreapp5.0"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="netcoreapp5.0"
/>

@dougbu dougbu Aug 10, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nguerrera should these also be updating @(AppHostPack) and @(FrameworkReference) items instead?

@nguerrera nguerrera Aug 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is creating new Known items to mimic what the SDK 5.0 would have, that is OK if you can't take a 5.0 SDK.

But Known items shouldn't need to be mutated to pick different versions.

@wtgodbe wtgodbe Aug 12, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nguerrera I'm not familiar with what exactly is being done here, do I need to make a change to this workaround?

</ItemGroup>

<!-- Work around https://github.com/dotnet/cli/issues/11378. -->
<Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Param(
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
[string] $CoreRootDirectory,
[string] $Architecture="x64",
[string] $Framework="netcoreapp3.0",
[string] $Framework="netcoreapp5.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
[string] $Branch=$env:BUILD_SOURCEBRANCH,
Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
architecture=x64
framework=netcoreapp3.0
framework=netcoreapp5.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
branch=$BUILD_SOURCEBRANCH
Expand Down
1 change: 1 addition & 0 deletions eng/targets/Npm.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<NpmTestArgs>test</NpmTestArgs>
<Configuration Condition="'$(Configuration)' == '' AND '$(ContinuousIntegrationBuild)' == 'true'">Release</Configuration>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<PackOnBuild>false</PackOnBuild>
</PropertyGroup>
</Project>
11 changes: 8 additions & 3 deletions eng/targets/Npm.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
BuildInParallel="true" />
</Target>

<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
<CallTarget Targets="_Pack" Condition="'$(PackOnBuild)' == 'true'" />
</Target>

<Target Name="_Build"
Condition="'$(IsBuildable)' != 'false'"
Expand All @@ -66,11 +68,12 @@
</PackDependsOn>
<PackDependsOn Condition="'$(NoBuild)' != 'true'">
$(PackDependsOn);
Build
Build;
_Pack
</PackDependsOn>
</PropertyGroup>

<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
<Target Name="_Pack" Condition="'$(IsPackable)' == 'true'" >
<PropertyGroup>
<_PackageTargetPath>$(MSBuildProjectDirectory)\$(PackageFileName)</_PackageTargetPath>
</PropertyGroup>
Expand All @@ -88,6 +91,8 @@
<OnError ExecuteTargets="_RestoreBackupPackageJsonFile" />
</Target>

<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)" />

<Target Name="_RestoreBackupPackageJsonFile">
<Move SourceFiles="$(_BackupPackageJson)" DestinationFiles="$(PackageJson)" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/BaselineGenerator/BaselineGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<StartArguments>-s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</StartArguments>
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/Maestro/Maestro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- TFM doesn't matter. These settings are required to make NuGet happy so we can restore required MSBuild packages. -->
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<ManifestsPath>$(ArtifactsDir)manifests\</ManifestsPath>
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
Expand Down
4 changes: 2 additions & 2 deletions eng/tools/RepoTasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
<Optimize>false</Optimize>
Expand All @@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/RepoTasks/RepoTasks.tasks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">netcoreapp3.0</_RepoTaskAssemblyFolder>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">netcoreapp5.0</_RepoTaskAssemblyFolder>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>

Expand Down
6 changes: 3 additions & 3 deletions src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.Antiforgery.netcoreapp3.0.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
<Compile Include="Microsoft.AspNetCore.Antiforgery.netcoreapp5.0.cs" />
<Reference Include="Microsoft.AspNetCore.DataProtection" />
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
Expand Down
0 ...t.AspNetCore.Antiforgery.netcoreapp3.0.cs → ...t.AspNetCore.Antiforgery.netcoreapp5.0.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;antiforgery</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...ureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
<Compile Include="Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp5.0.cs" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
Expand Down
0 ...uthentication.AzureAD.UI.netcoreapp3.0.cs → ...uthentication.AzureAD.UI.netcoreapp5.0.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>ASP.NET Core Azure Active Directory Integration provides components for easily integrating Azure Active Directory authentication within your ASP.NET Core application.</Description>
<RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory Integration package.</RazorAssemblyDescription>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsShippingPackage>true</IsShippingPackage>
Expand Down
2 changes: 1 addition & 1 deletion ...Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureAD.UI</RootNamespace>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions ...Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
<Compile Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp5.0.cs" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
Expand Down
0 ...entication.AzureADB2C.UI.netcoreapp3.0.cs → ...entication.AzureADB2C.UI.netcoreapp5.0.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<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>
<RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory B2C Integration package.</RazorAssemblyDescription>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsShippingPackage>true</IsShippingPackage>
Expand Down
2 changes: 1 addition & 1 deletion ...tication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureADB2C.UI</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...D/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<Target Name="PublishAssets" AfterTargets="Publish">
<ItemGroup>
<_PublishFiles Include="$(ArtifactsBinDir)AzureAD.WebSite\$(Configuration)\netcoreapp3.0\AzureAD.WebSite.deps.json" />
<_PublishFiles Include="$(ArtifactsBinDir)AzureAD.WebSite\$(Configuration)\$(DefaultNetCoreTargetFramework)\AzureAD.WebSite.deps.json" />
</ItemGroup>
<Copy
SourceFiles="@(_PublishFiles)"
Expand Down
2 changes: 1 addition & 1 deletion src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...ppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
<Compile Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp5.0.cs" />
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
</ItemGroup>
Expand Down
0 ...pServices.HostingStartup.netcoreapp3.0.cs → ...pServices.HostingStartup.netcoreapp5.0.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<Description>ASP.NET Core lightup integration with Azure AppServices.</Description>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
<IsShippingPackage>true</IsShippingPackage>
Expand Down
6 changes: 3 additions & 3 deletions ...e/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netcoreapp5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
<Compile Include="Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp5.0.cs" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.Extensions.Logging.AzureAppServices" />
</ItemGroup>
Expand Down
0 ...reAppServicesIntegration.netcoreapp3.0.cs → ...reAppServicesIntegration.netcoreapp5.0.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>ASP.NET Core integration with Azure AppServices.</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion ...AppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading