Skip to content

Remove aspnet/Scaffolding submodule #7166

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
Merged
merged 4 commits into from
Feb 1, 2019
Merged

Remove aspnet/Scaffolding submodule #7166

merged 4 commits into from
Feb 1, 2019

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented Jan 31, 2019

  • aspnet/AspNetCore-Internal#1341

@dougbu
Remove aspnet/Scaffolding submodule
c18bb31 
- aspnet/AspNetCore-Internal#1341
@dougbu
Copy link
Contributor Author

dougbu commented Jan 31, 2019

@natemcmaster I'm seeing the following errors in the CI checks. We previously got versions for these packages from the Scaffolding submodule.

I see references to these Microsoft.VisualStudio.Web.CodeGeneration.* packages in build\artifacts.props and src\PackageArchive\Scenario.WebApp\Scenario.WebApp.csproj but we no longer have anything that sets e.g. $(MicrosoftVisualStudioWebCodeGenerationContractsPackageVersion). Should those lines be removed?

2019-01-31T20:30:52.8075783Z /home/vsts/work/1/s/build/repo.targets(135,5): error : Could not detect version information for package id: [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8077273Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * dotnet-aspnet-codegenerator [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8078068Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.Contracts [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8078844Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.Core [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8079570Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.Design [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8080537Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8081384Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.Templating [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8082555Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration.Utils [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8083884Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGeneration [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]
2019-01-31T20:30:52.8085184Z /home/vsts/work/1/s/build/repo.targets(135,5): error :  * Microsoft.VisualStudio.Web.CodeGenerators.Mvc [/home/vsts/work/1/.dotnet/buildtools/korebuild/2.1.7-build-20190110.2/KoreBuild.proj]

@dougbu
Copy link
Contributor Author

dougbu commented Jan 31, 2019

Separately, has something regressed on the agents we're using? File locking conflict warnings now seem common.

@Eilon Eilon added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 31, 2019
@natemcmaster
Copy link
Contributor

@dougbu. Yes, remove the lines from artifacts.props. We will treat the scaffolding packages like any other 'external dependency'. You'll need to add variables to build/dependencies.props, such as MicrosoftVisualStudioWebCodeGenerationPackageVersion, with their value set to 2.1.7 (and 2.2.1 for release/2.2)

@natemcmaster
Copy link
Contributor

You'll need to remove Scaffolding from these files too:

https://github.com/aspnet/AspNetCore/blob/release/2.1/build/submodules.props
https://github.com/aspnet/AspNetCore/blob/release/2.1/build/buildorder.props

@dougbu
Copy link
Contributor Author

dougbu commented Jan 31, 2019 •
edited
Loading

We will treat the scaffolding packages like any other 'external dependency'.

Hmm, I don't see any references to Scaffolding packages except in src\PackageArchive\Scenario.WebApp\Scenario.WebApp.csproj. Would it be "better" to remove that dependency?

Nevermind

@dougbu
Remove aspnet/Scaffolding references from build/artifacts.props, `b…
27bcba6 
…uild/submodules.props` and our templates

- add versions for these packages in `build/dependencies.props` to enable their inclusion in the package archives
@dougbu
Copy link
Contributor Author

dougbu commented Jan 31, 2019

with their value set to 2.1.7 (and 2.2.1 for release/2.2)

@natemcmaster I see no need for these version variables in release/2.2. Am I missing something?

@natemcmaster
Copy link
Contributor

I see no need for these version variables in release/2.2. Am I missing something?

@natemcmaster
Copy link
Contributor

pre-mature ctrl + enter...

I see no need for these version variables in release/2.2. Am I missing something?

No, I think you're right. We can completely remove the variables from 2.2

dougbu added 2 commits January 31, 2019 22:17
@dougbu
Remove Scaffolding mention from build/buildorder.props
5d306fe
@dougbu
dotnet-aspnet-codegenerator is another aspnet/Scaffolding package
edb10ab 
- also Undo `Templating` removal from `build/submodules.props`
  - this feels wrong but build broke without this line
@dougbu dougbu force-pushed the dougbu/remove.scaffolding.1341 branch from 2f8a293 to edb10ab Compare February 1, 2019 06:20
@dougbu dougbu changed the title WIP: Remove aspnet/Scaffolding submodule Remove aspnet/Scaffolding submodule Feb 1, 2019
@dougbu
Copy link
Contributor Author

dougbu commented Feb 1, 2019

No longer a WIP and required CI checks have passed.

@dougbu dougbu merged commit bb8c6fc into release/2.1 Feb 1, 2019
@dougbu dougbu deleted the dougbu/remove.scaffolding.1341 branch February 1, 2019 18:15
dougbu added a commit that referenced this pull request Feb 22, 2019
@dougbu
Restore Microsoft.VisualStudio.Web.CodeGeneration.Design references i…
4ed02eb 
…n templates

- revert part of "Remove aspnet/Scaffolding submodule (#7166)"
- that was commit bb8c6fc
dougbu added a commit that referenced this pull request Feb 22, 2019
@dougbu
Restore Microsoft.VisualStudio.Web.CodeGeneration.Design references i…
5f9c635 
…n templates

- revert part of "Remove aspnet/Scaffolding submodule (#7166)"
- that was commit bb8c6fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@natemcmaster natemcmaster natemcmaster approved these changes

@ryanbrandenburg ryanbrandenburg Awaiting requested review from ryanbrandenburg

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dougbu @natemcmaster @Eilon