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

Consume dependencies updates automatically via darc #6676

Merged
merged 2 commits into from
Jan 14, 2019
Merged

Consume dependencies updates automatically via darc #6676

merged 2 commits into from
Jan 14, 2019

Conversation

natemcmaster
Copy link
Contributor

This implements half of #4264 -- the half that consumes updates via darc.

The other half -- publishing to darc -- will come as a separate PR.

natemcmaster
natemcmaster commented Jan 14, 2019
View reviewed changes
src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" />
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dougbu @sebastienros - It appears the "BenchmarkX" version variables haven't been updated since 2.1.1, and wasn't sure if you wanted to continue to do this manually or if you had other automation to override this. So,this PR isn't changing the version of this benchmark dependency, just the way it is set. I'm removing the variable until we have a strategy for updating this automatically via darc.

Copy link
Member

Choose a reason for hiding this comment

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

These versions were intentionally set to downlevel values. But, don't we have checks that disallow setting versions directly in the .csproj files?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope. That check is gone now.

@natemcmaster
Copy link
Contributor Author

FYI @chcosta

bricelam
bricelam approved these changes Jan 14, 2019
View reviewed changes
eng/Version.Details.xml
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>000000</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview.18604.3">
Copy link
Contributor

Choose a reason for hiding this comment

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

Random thought: You could just list this one from EF and use $(MicrosoftEntityFrameworkCoreVersion) everywhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd rather have a fully-defined dependency list. This will help us when doing static analysis for the impacts of changes like package deprecation, rename, one-off-builds, etc.

eng/Versions.props
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview-27219-3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27219-3</MicrosoftNETCoreAppPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview-27219-3</MicrosoftDotNetPlatformAbstractionsPackageVersion>

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think white space is preserved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sigh.

Copy link
Contributor

Choose a reason for hiding this comment

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

Probably a one-line fix. ...and a day to find the line, three days to discuss the change, and another day to get it approved, merge it, and get a new build. (lol, sorry--feeling pessimistic today)

@natemcmaster
Copy link
Contributor Author

@bricelam @rynowak running darc update-dependencies locally does not appear to update the version variables for all dependencies. It misses the version variables for:

  • MicrosoftNETSdkRazorPackageVersion - this comes from aspnet/AspNetCore-Tooling.
  • DotNetEfPackageVersion - from aspnet/EntityFrameworkCore.

I've checked the expected subscriptions exist. Maybe the build manifest isn't including this package, somehow?

https://github.com/aspnet/AspNetCore-Tooling (.NET Core 3 Dev) ==> 'https://github.com/aspnet/AspNetCore' ('master')
  - Id: bbb88f15-7f3c-4fe7-0734-08d675c684c9
  - Update Frequency: everyBuild
  - Merge Policies:
    AllChecksSuccessful
  - Last Build: N/A
https://github.com/aspnet/EntityFrameworkCore (.NET Core 3 Dev) ==> 'https://github.com/aspnet/AspNetCore' ('master')
  - Id: 4cbc2a9e-8529-4b8a-adce-08d67a4e0ac2
  - Update Frequency: everyBuild
  - Merge Policies:
    AllChecksSuccessful
  - Last Build: N/A

cc @mmitche

@mmitche
Copy link
Member

mmitche commented Jan 14, 2019

@natemcmaster investigating

rynowak
rynowak reviewed Jan 14, 2019
View reviewed changes
.gitignore
@@ -31,3 +31,4 @@ BenchmarkDotNet.Artifacts/
korebuild-lock.txt
.gradle/
src/SignalR/clients/**/dist/
modules/
Copy link
Member

Choose a reason for hiding this comment

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

/cc @sebastienros

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I kept accidentally committing submodules when switching between release/2.x and master branches.

@sebastienros
Copy link
Member

I am fine with the changes on the Benchmarks apps.

rynowak
rynowak approved these changes Jan 14, 2019
View reviewed changes
Copy link
Member

@rynowak rynowak left a comment

Choose a reason for hiding this comment

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

Looks pretty right to me.

dougbu
dougbu reviewed Jan 14, 2019
View reviewed changes
Copy link
Member

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Didn't read enough of this to approve. Please let me know if I should look deeper.

src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" />
Copy link
Member

Choose a reason for hiding this comment

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

These versions were intentionally set to downlevel values. But, don't we have checks that disallow setting versions directly in the .csproj files?

src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
@@ -17,7 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractions20PackageVersion)" />
<!-- Hard-coded to 2.0 because this project currently targets netcoreapp2.0 -->
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
Copy link
Member

Choose a reason for hiding this comment

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

👍

@natemcmaster
Copy link
Contributor Author

Build and tests pass, so going to merge now. I will follow-up on why darc is missing some packages separately. It's at least partially due to missing config on AspNetCore-Tooling.

@natemcmaster natemcmaster merged commit 7f7723b into dotnet:master Jan 14, 2019
@natemcmaster natemcmaster deleted the darc-in branch January 14, 2019 20:01
@natemcmaster natemcmaster mentioned this pull request Jan 14, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bricelam bricelam bricelam approved these changes

@dougbu dougbu dougbu left review comments

@rynowak rynowak rynowak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@natemcmaster @mmitche @sebastienros @bricelam @rynowak @dougbu