Skip to content

[release/3.0] Update dependencies from 4 repositories #14425

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
merged 120 commits into from
Oct 29, 2019
Merged

[release/3.0] Update dependencies from 4 repositories #14425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
1d190ea
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Sep 25, 2019
d1c697c
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Sep 25, 2019
79f30a6
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Sep 25, 2019
504e032
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Sep 25, 2019
b84f5fd
Add feed
Sep 26, 2019
14287d1
Update dependencies from https://github.com/aspnet/Blazor build 20190…
dotnet-maestro[bot] Sep 26, 2019
08453d2
Remove potentially unnecessary feeds
mmitche Sep 26, 2019
f3df5cb
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Sep 26, 2019
25eff27
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 3, 2019
ad8c935
Update dependencies from https://github.com/aspnet/Blazor build 20191…
dotnet-maestro[bot] Oct 3, 2019
918dded
Install the runtime during source build
wtgodbe Oct 4, 2019
7e57ded
Pin m.nc.app.ref
wtgodbe Oct 4, 2019
8fbd355
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 7, 2019
1b0614e
Add aspnetcore-dev feed back to nuget.config
wtgodbe Oct 7, 2019
10f526f
Pin internal refs package
mmitche Oct 8, 2019
63de71a
Update dependencies
mmitche Oct 8, 2019
77e9576
Revert "Update dependencies"
mmitche Oct 8, 2019
2f3eed2
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 8, 2019
c21e40d
Fixup feeds and update EFCore
mmitche Oct 8, 2019
701a080
Move efcore internal refs dependency
mmitche Oct 8, 2019
78e09e3
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 8, 2019
f54c607
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 11, 2019
5556737
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 12, 2019
ad59896
Compile against ref assemblies
Oct 10, 2019
b08b5e4
typo
Oct 10, 2019
72d3d93
Add manually generated DataProtection internal ref assembly
Oct 10, 2019
bef8e00
Kestrel
Oct 10, 2019
cf9aa0a
Hosting
Oct 11, 2019
7d533bc
Http
Oct 11, 2019
1044db1
Mvc
Oct 11, 2019
fd9926a
Middleware
Oct 11, 2019
d19dffd
SignalR
Oct 11, 2019
6f6d22e
Identity
Oct 11, 2019
e67cdd6
Components
Oct 11, 2019
38239d3
Cleanup
Oct 11, 2019
e2b4ca1
Cleanup 2
Oct 13, 2019
ee46df5
Feedback
Oct 13, 2019
dbf74f2
Fix crossgen
Oct 14, 2019
f03bf65
Fix tools
Oct 14, 2019
411d900
Try explicitly specifying ExcludeFromSourceBUild
Oct 14, 2019
4b3d556
Build targeting pack for 3.0.1
wtgodbe Oct 14, 2019
554c460
Improve condition for building targeting pack in 3.0.1
wtgodbe Oct 14, 2019
2cb8dad
Fix typo in GenerateTestProps.targets
wtgodbe Oct 14, 2019
b589e58
Try fixing siteex build
Oct 15, 2019
0734b76
Fix Item->Property conversion in GenerateTestProps.targets
wtgodbe Oct 15, 2019
6f72c90
Another attempt at fixing template tests
wtgodbe Oct 15, 2019
06ff350
Another attempt at fixing template tests
wtgodbe Oct 15, 2019
1d80e3d
Resolve reference assemblies from Extensions
Oct 15, 2019
41c00e4
Add big list of project references, for tests to use
wtgodbe Oct 15, 2019
c78f161
Try fixing up condition in IndirectReferences.props
wtgodbe Oct 16, 2019
aaca1ac
Remove Microsoft.AspNetCore.Components.Web.JS from indirect reference…
wtgodbe Oct 16, 2019
2940bf1
Fix broken transitive references to extensions refs
Oct 16, 2019
a93d96d
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 16, 2019
7bffa9c
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 16, 2019
1e347e4
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 16, 2019
c67f1e9
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 16, 2019
4652d82
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 16, 2019
25d88e3
Dependency coherency updates
dotnet-maestro[bot] Oct 16, 2019
46cd240
Add Extensions references to IndirectReferences.props
wtgodbe Oct 16, 2019
2a3a4f2
Merge branch 'release/3.0' into darc-release/3.0-415c11a4-665d-418c-b…
wtgodbe Oct 16, 2019
45dcd6c
Include props file in more places
wtgodbe Oct 16, 2019
fb976f2
Merge branch 'darc-release/3.0-415c11a4-665d-418c-b7cd-51c83279a567' …
wtgodbe Oct 16, 2019
fc19c38
Remove ref to components.web.js
wtgodbe Oct 16, 2019
43ad880
Fix warnings
wtgodbe Oct 16, 2019
7d094a7
Add p2p references from Extensions to IndirectReferences.props
wtgodbe Oct 17, 2019
ab53687
Remove PrivateAssets refs, add back manual removals
wtgodbe Oct 17, 2019
6036d8c
Remove web.js (again)
wtgodbe Oct 17, 2019
2a9c23b
Add refs for test -> Extensions -> P2P
wtgodbe Oct 17, 2019
e48651d
Add one more class of indirect references
wtgodbe Oct 17, 2019
977c177
Merge branch 'release/3.0' into darc-release/3.0-415c11a4-665d-418c-b…
wtgodbe Oct 17, 2019
91ecfad
Don't build refPack during source build
wtgodbe Oct 17, 2019
fb9ec11
add refs from non-ref projects
wtgodbe Oct 17, 2019
a7b000b
Fix warnings on ImplictlyDefined packageRefs
wtgodbe Oct 17, 2019
ef16cae
Fix ItemGroup tag
wtgodbe Oct 17, 2019
c0ae394
Cleanup
Oct 17, 2019
efabc6a
Exclude sources files from indirect references
Oct 17, 2019
b1a8fb7
Fix JSInterop
wtgodbe Oct 17, 2019
e01e3d9
Add manual indirect references to project references
Oct 18, 2019
ce009ba
Do not substitute ext ref assemblies in ref pack
Oct 18, 2019
5d40c6d
Remove assembly list hack
Oct 18, 2019
6c18c9a
Increase timeout to 5 hours (!)
wtgodbe Oct 18, 2019
031c22c
Add samples/test assets
wtgodbe Oct 18, 2019
a6c81ea
Don't add indirect refs for ProjectRefs with ReferenceOutputAssembly=…
wtgodbe Oct 18, 2019
ed8e20c
Fix item resolution
wtgodbe Oct 18, 2019
7edfa0f
Fix item resolution again
wtgodbe Oct 18, 2019
62dfd65
Fix item resolution again
wtgodbe Oct 18, 2019
570f61f
Revert logic from last change
wtgodbe Oct 18, 2019
3dbc6d3
Manual fixup to remove bad refs
wtgodbe Oct 18, 2019
8240188
More manual fixup
wtgodbe Oct 18, 2019
8f9141e
Fix version.details.xml
wtgodbe Oct 18, 2019
e829b59
Alphabetize
wtgodbe Oct 18, 2019
f59a091
Remove .sources files
wtgodbe Oct 18, 2019
6fa2816
Add JSInterop
wtgodbe Oct 18, 2019
12e1618
Disable the TestFramework assembly attribute from Logging.Testing
Oct 19, 2019
c8f2567
Fix Functional Tests 1
Oct 22, 2019
f7eadb4
Fix Functional Tests 2
Oct 22, 2019
0d062c8
Fix Template Test 1
Oct 22, 2019
7a3737b
Try again
Oct 22, 2019
ce36199
Experimental fix for blazor e2e tests
Oct 22, 2019
13b39ef
Add missed samples, test asset files to IndirectRefs.props
wtgodbe Oct 22, 2019
e284b28
Remove web.js
wtgodbe Oct 22, 2019
ddc2878
Manual fixup
wtgodbe Oct 22, 2019
7d8224d
Manual fixup
wtgodbe Oct 22, 2019
05d3390
Fix Mvc tests
Oct 22, 2019
b412576
Cleanup
Oct 22, 2019
cc350d4
Fix E2E test timeouts
wtgodbe Oct 22, 2019
fd2027a
Merge branch 'darc-release/3.0-415c11a4-665d-418c-b7cd-51c83279a567' …
wtgodbe Oct 22, 2019
317444f
Revert change that broke extensions references
Oct 23, 2019
bc9c4cd
Fix Analyzer tests
Oct 23, 2019
e808199
Experimental fix for StaticFiles.FunctionalTest
Oct 23, 2019
c91034c
Fix SignalR functional tests
Oct 23, 2019
1b92a0e
Fix Mvc Functional test with runtime compilation
Oct 23, 2019
9ea129a
Experimental fix: try pinning Extensions versions in package override
Oct 25, 2019
401db22
Cleanup part1
Oct 25, 2019
9783b9e
Fix HttpOverrides tests
Oct 26, 2019
054f353
Cleanup and revert some unneeded fixes
Oct 27, 2019
ea81866
Undo unneeded changes
Oct 28, 2019
3359b2b
Fix E2E test timeout
wtgodbe Oct 28, 2019
af73cd8
add comment
wtgodbe Oct 28, 2019
2cc841d
Missed updates
Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>

<!-- We need to build the targeting pack in 3.0.1. We can remove this line from any branch other than release/3.0 -->
<IsTargetingPackBuilding Condition="'$(VersionPrefix)' == '3.0.1' AND '$(DotNetBuildFromSource)' != 'true'">true</IsTargetingPackBuilding>

<!--
Archives and installers using this prefix are intended for internal-use only.
For example, this .zip is used to handoff bits to partner teams who then incorporate our shared frameworks
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 @@ -105,9 +105,8 @@
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
</ItemGroup>

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

Expand Down Expand Up @@ -155,6 +154,7 @@
</Target>

<Import Project="eng\Workarounds.targets" />
<Import Project="eng\IndirectReferences.props" Condition="'$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true'" />
<Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
<Import Project="eng\targets\Cpp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
<Import Project="eng\targets\CSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
Expand Down
18 changes: 7 additions & 11 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
</packageSources>
</configuration>
9 changes: 8 additions & 1 deletion eng/GenAPI.exclusions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame
# Manually implemented - https://github.com/dotnet/arcade/issues/2066
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel
# Manually implemented - Need to include internal setter
T:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider
F:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.{Cache}k__BackingField
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.#ctor
P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.get_Cache
M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache)
Loading