Skip to content
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

Jump to bottom

[master] Update dependencies from dotnet/efcore #18247

Merged
merged 32 commits into from
Jan 29, 2020
Merged

[master] Update dependencies from dotnet/efcore #18247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d7a0979
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 9, 2020
7c94a6f
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 9, 2020
1f4e01a
Add workarounds
wtgodbe Dec 19, 2019
d427e2a
Fix workaround
BrennanConroy Jan 2, 2020
9c38c5d
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 11, 2020
c3ab9d6
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 11, 2020
f8bd665
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 12, 2020
c61dfe4
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 14, 2020
2d75054
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 14, 2020
0a6f0c1
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 15, 2020
14277fa
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 16, 2020
e6d3947
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 18, 2020
1e811a8
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 20, 2020
5da6fc2
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 22, 2020
ac35d10
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 23, 2020
836003a
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 23, 2020
4e85199
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 23, 2020
9c594d7
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 23, 2020
06a4d09
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 25, 2020
56b833a
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 25, 2020
67452b8
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 26, 2020
efda6ba
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 26, 2020
796236a
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 26, 2020
d7966b8
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 27, 2020
9398f4c
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 27, 2020
df6e92b
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 27, 2020
83952b0
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Jan 28, 2020
489877f
Merge branch 'master' into darc-master-c42c7270-bf2e-4478-a810-819e5a…
wtgodbe Jan 29, 2020
bb465ed
Revert "Fix workaround"
wtgodbe Jan 29, 2020
901aa8a
Revert "Add workarounds"
wtgodbe Jan 29, 2020
de88de7
Add EF workaround to template tests
wtgodbe Jan 29, 2020
a31be73
Remove NoWarn NU1605
wtgodbe Jan 29, 2020
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<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-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/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="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
42 changes: 21 additions & 21 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,33 @@
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
<Sha>9cc4b747544c7f18829829f997239bf6c60cfcbb</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="dotnet-ef" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha.1.19602.5">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>e37a6be067ab62da7fe9b33b93faaa90ed829237</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha.1.20078.1">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>b4ae28206d90fbef35bac82278444913d7666675</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="5.0.0-alpha.1.20076.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.20075.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20075.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-alpha.1.20075.5</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<!-- Packages from dotnet/runtime -->
<MicrosoftCSharpPackageVersion>5.0.0-alpha.1.20075.5</MicrosoftCSharpPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha.1.20075.5</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha.1.20075.5</MicrosoftWin32SystemEventsPackageVersion>
Expand Down Expand Up @@ -158,13 +158,13 @@
<MicrosoftJSInteropPackageVersion>5.0.0-alpha.1.20076.1</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>5.0.0-preview3.1.20076.1</MonoWebAssemblyInteropPackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.0-alpha.1.19602.5</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCorePackageVersion>
<dotnetefPackageVersion>5.0.0-alpha.1.20078.1</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha.1.20078.1</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Packages from dotnet/aspnetcore-tooling -->
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-alpha.1.20076.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha.1.20076.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
Expand Down
3 changes: 0 additions & 3 deletions src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<PropertyGroup>
<OutputType>exe</OutputType>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<!-- Temporary workaround - the build thinks 'alpha1.111' is newer than 'alpha.1.222'.
Remove once we can ingest EF again: https://github.com/dotnet/aspnetcore/issues/17949 -->
<NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions ...kCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Diagnostics.HealthChecks</RootNamespace>
<!-- Temporary workaround - the build thinks 'alpha1.111' is newer than 'alpha.1.222'.
Remove once we can ingest EF again: https://github.com/dotnet/aspnetcore/issues/17949 -->
<NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>DotNetEfFullPath</_Parameter1>
<_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/$(DefaultNetCoreTargetFramework)/any/dotnet-ef.dll</_Parameter2>
<_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>TestPackageRestorePath</_Parameter1>
Expand Down