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.

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

Merge future to master #917

Merged
merged 42 commits into from
Feb 27, 2017
Merged

Merge future to master #917

merged 42 commits into from
Feb 27, 2017

Conversation

nguerrera
Copy link
Contributor

We're opening master for 15.3 / netstandard 2.0 development, so merging future there and we will delete the future branch.

@srivatsn @ramarag @eerhardt @333fred

nguerrera and others added 30 commits December 6, 2016 16:42
Bump version to 1.1 in future branch
Update NuGet to include new TFMs for .NET Core 2.0.
Dotnet publish with filter profile
# Conflicts:
#	build/DependencyVersions.props
#	src/Tasks/Microsoft.NET.Build.Tasks/PublishAssembliesResolver.cs
#	src/Tasks/Microsoft.NET.Build.Tasks/Resources/Strings.resx
Fixed the download scripts to consume cli rel/1.0.0 branch
Creating an Intermediate directory for cache to work in
Set VS Install location environment variables in netci.groovy
The VS SDK isn't installed on CI machines
@nguerrera
Copy link
Contributor Author

I'll wait for @srivatsn's approval just to be absolutely sure we're ready to pull the trigger on future -> master.

@srivatsn srivatsn merged commit dfb976b into master Feb 27, 2017
@nguerrera nguerrera deleted the future branch March 3, 2017 16:42
mmitche pushed a commit to mmitche/sdk that referenced this pull request Jun 5, 2020
…0190829.1 (dotnet#917)

- Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-rc1.19429.1
- Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-rc1.19429.1
- Microsoft.AspNetCore.Analyzers - 3.0.0-rc1.19429.1
- Microsoft.AspNetCore.Components.Analyzers - 3.0.0-rc1.19429.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants