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

Merge release/15.5 to master #1693

Merged
merged 11 commits into from
Oct 30, 2017
Merged

Merge release/15.5 to master #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a58474
Revert "Update support libraries to those that are only lib."
dsplaisted Sep 26, 2017
0dc1cef
Merge pull request #1610 from dotnet/revert-1582-updateNetFxNS2Bits
dsplaisted Sep 27, 2017
0d88ca7
Merge branch 'release/2.0-vs' into release/2.0.0
nguerrera Oct 13, 2017
8fde008
Bump version to 2.0.3-servicing
nguerrera Oct 13, 2017
1e913b0
Merge pull request #1652 from nguerrera/merge-2.0-vs
nguerrera Oct 13, 2017
315ecb9
Add BuildForCli target
ellismg May 20, 2017
578d62c
Unify versions with dotnet/cli release/2.0.0
nguerrera Oct 17, 2017
c868ade
Merge pull request #1661 from nguerrera/accept-patches
nguerrera Oct 18, 2017
a10297f
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5…
nguerrera Oct 24, 2017
4af796e
Put back "Update support libraries to those that are only lib."
nguerrera Oct 24, 2017
46c87b3
Merge pull request #1680 from dotnet/merges/release/2.0.0-to-release/…
nguerrera Oct 25, 2017
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
6 changes: 3 additions & 3 deletions build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<PropertyGroup>
<MsBuildPackagesVersion>15.2.0-preview-000093-02</MsBuildPackagesVersion>
<DependencyModelVersion>2.0.0-preview1-001960</DependencyModelVersion>
<PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion>
<MsBuildPackagesVersion>15.4.8</MsBuildPackagesVersion>
<DependencyModelVersion>2.0.0</DependencyModelVersion>
<PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
<NuGetVersion>4.5.0-preview2-4529</NuGetVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
Expand Down
15 changes: 15 additions & 0 deletions build/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,22 @@
Targets="Pack"
Properties="$(CommonMSBuildGlobalProperties);NoBuild=true"
/>
</Target>

<Target Name="BuildForCli">
<MSBuild Projects="@(NuGetProjectFile)"
Targets="Restore"
Properties="$(CommonMSBuildGlobalProperties)" />

<MSBuild Projects="@(NuGetProjectFile)"
Targets="Build"
Properties="$(CommonMSBuildGlobalProperties)" />

<MSBuild BuildInParallel="true"
Projects="@(NuGetProjectFile)"
Targets="Pack"
Properties="$(CommonMSBuildGlobalProperties);NoBuild=true"
/>
</Target>

<Target Name="CleanNuGetPackages">
Expand Down