Skip to content

Merge release/2.1.3xx to master #1995

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

Merged
johnbeisner merged 10 commits into from
Mar 8, 2018
Merged

Merge release/2.1.3xx to master #1995

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81d89ab
Insert NuGet Build 4.6.0-rtm-4918 into sdk
nugetlurker Feb 9, 2018
8147b5d
Update CLI version to 2.1.100-preview-007377
nguerrera Feb 16, 2018
bd71b81
Work around #1730
nguerrera Nov 14, 2017
c13af3e
Updating machine affinity to 15.5
Feb 16, 2018
225d161
Merge pull request #1972 from dotnet/update_affinity
Feb 16, 2018
aebf9b1
Merge pull request #1947 from dotnet/nuget.client.release-4918-1-1
Feb 17, 2018
6aa44fe
Merge pull request #1974 from dotnet/merges/release/2.1.1xx-to-releas…
nguerrera Feb 20, 2018
16a8132
Insert NuGet Build 4.7.0-preview1-4927 into sdk (#1970)
nugetlurker Feb 21, 2018
6199053
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release…
nguerrera Feb 22, 2018
ae70af6
Merge pull request #1979 from dotnet/merges/release/2.1.2xx-to-releas…
nguerrera Feb 23, 2018
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
2 changes: 1 addition & 1 deletion build/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<MicrosoftExtensionsDependencyModelVersion>2.0.0</MicrosoftExtensionsDependencyModelVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<NuGetBuildTasksPackVersion>4.7.0-preview1-4846</NuGetBuildTasksPackVersion>
<NuGetBuildTasksPackVersion>4.7.0-preview1-4927</NuGetBuildTasksPackVersion>
<NuGetPackagingVersion>$(NuGetBuildTasksPackVersion)</NuGetPackagingVersion>
<NuGetProjectModelVersion>$(NuGetBuildTasksPackVersion)</NuGetProjectModelVersion>
<PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
Expand Down