Skip to content

Commit 2c6456d

Browse files
dotnet-maestro[bot]John Luo
dotnet-maestro[bot]
authored and
John Luo
committed
[release/3.0] Update dependencies from 4 repositories (#14425)
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3 * Update dependencies from https://github.com/aspnet/Blazor build 20191003.2 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191007.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191010.4 * Remove potentially unnecessary feeds * Install the runtime during source build * Pin m.nc.app.ref * Add aspnetcore-dev feed back to nuget.config * Pin internal refs package * Move efcore internal refs dependency * Compile against ref assemblies * Add manually generated internal ref assembly: * DataProtection * Kestrel * Hosting * Http * Mvc * Middleware * SignalR * Identity * Components * Fix crossgen for ref compilation * Fix tools for ref compilation * Explicitly specify ExcludeFromSourceBuild * Build targeting pack for 3.0.1 * Improve condition for building targeting pack in 3.0.1 * Fixing siteex build for ref compilation * Resolve reference assemblies from Extensions * Don't build refPack during source build * Add big list of project references, for tests to use * Exclude sources files from indirect references * The types in these packages will be compiled into the binaries of the projects that directly depended o it * Add manual indirect references to project references * Add samples/test assets * Don't add indirect refs for ProjectRefs with ReferenceOutputAssembly=false * Fix JSInterop for ref compilation * Do not substitute ext ref assemblies in ref pack * Disable the TestFramework assembly attribute from Logging.Testing There's custom logic in ProjectTemplates.Tests to use a different TestFramework instead * Fix Functional tests * Issues caused by incorrect deps files working around this via test infrastructure instead * Mvc * Analyzers * StaticFiles * SignalR * HttpOverrides
1 parent 0da2edb commit 2c6456d

File tree

168 files changed

+14504
-397
lines changed

Some content is hidden

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

168 files changed

+14504
-397
lines changed

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
9494
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
9595

96+
<!-- We need to build the targeting pack in 3.0.1. We can remove this line from any branch other than release/3.0 -->
97+
<IsTargetingPackBuilding Condition="'$(VersionPrefix)' == '3.0.1' AND '$(DotNetBuildFromSource)' != 'true'">true</IsTargetingPackBuilding>
98+
9699
<!--
97100
Archives and installers using this prefix are intended for internal-use only.
98101
For example, this .zip is used to handoff bits to partner teams who then incorporate our shared frameworks

‎Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@
105105
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
106106
</ItemGroup>
107107

108-
<PropertyGroup Condition="'$(Language)' == 'C#'">
108+
<PropertyGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
109109
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
110-
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
111110
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
112111
</PropertyGroup>
113112

@@ -155,6 +154,7 @@
155154
</Target>
156155

157156
<Import Project="eng\Workarounds.targets" />
157+
<Import Project="eng\IndirectReferences.props" Condition="'$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true'" />
158158
<Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
159159
<Import Project="eng\targets\Cpp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
160160
<Import Project="eng\targets\CSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />

‎NuGet.config

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-core-setup-903ca49" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-903ca49e/nuget/v3/index.json" />
77
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
8-
<add key="darc-pub-aspnet-Extensions-0b951c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-0b951c16/nuget/v3/index.json" />
9-
<add key="darc-pub-aspnet-EntityFrameworkCore-b403b17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-EntityFrameworkCore-b403b17b/nuget/v3/index.json" />
8+
<add key="darc-pub-aspnet-Extensions-40c0002" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-40c00020/nuget/v3/index.json" />
9+
<add key="darc-pub-aspnet-EntityFrameworkCore-e2fe2f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-EntityFrameworkCore-e2fe2f42/nuget/v3/index.json" />
1010
<add key="darc-pub-aspnet-AspNetCore-Tooling-4ef35e1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-4ef35e11/nuget/v3/index.json" />
1111
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1212
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
13-
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
14-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
15-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
16-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
13+
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
14+
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
15+
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
16+
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
1717
<add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
18-
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1918
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
20-
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
21-
<add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
22-
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
2319
</packageSources>
2420
</configuration>

‎eng/GenAPI.exclusions.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@
22
T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame
33
# Manually implemented - https://github.com/dotnet/arcade/issues/2066
44
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel
5-
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel
5+
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel
6+
# Manually implemented - Need to include internal setter
7+
T:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider
8+
F:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.{Cache}k__BackingField
9+
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.#ctor
10+
P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache
11+
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.get_Cache
12+
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache)

0 commit comments

Comments
 (0)