huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into prkrishn/update-versions

This commit is contained in:
Pranav K 2020-01-29 13:12:46 -08:00 committed by GitHub
parent f22c107eae a1e226f06c
commit 9acd1283e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NuGet.config
View File

@ -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" />

42
eng/Version.Details.xml
View File

@ -29,33 +29,33 @@
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
<Sha>1ed35593a6d964bb2301ac59ce3e982ab8c95482</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.20077.3" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>

14
eng/Versions.props
View File

@ -158,13 +158,13 @@
<MicrosoftJSInteropPackageVersion>5.0.0-alpha.1.20077.3</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>5.0.0-preview3.1.20077.3</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.20077.4</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha.1.20077.4</MicrosoftAspNetCoreRazorLanguagePackageVersion>

3
src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj
View File

@ -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>

3
src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj
View File

@ -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>

2
src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
View File

@ -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>