Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Fix multiple build issues with VS2017 #162

Open
wjk wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Fix multiple build issues with VS2017 #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46736e2
Bump problematic NuGet packages
wjk Jun 29, 2018
909f43d
Stop the build from stepping on its own toes
wjk Jun 29, 2018
71d5894
Rearrange project file imports
wjk Jun 29, 2018
7989aa3
Move msbuild.rsp properties into csproj
wjk Jun 29, 2018
f6acb27
Bump more NuGet packages
wjk Jun 29, 2018
bfc62c9
Revert "Move msbuild.rsp properties into csproj"
wjk Jun 30, 2018
043a605
Merge branch 'dev' into fix-build-issues
wjk Sep 4, 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: 2 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,6 @@ AssemblyVersion=$(AssemblyVersion)" />
<Copy SourceFiles="$(PackageTargetPath)" DestinationFolder="$(TEMP)\packages" />
</Target>

<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets')" />
Copy link
Copy Markdown
Contributor

@kzu kzu Sep 4, 2018

Choose a reason for hiding this comment

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

Brought this commit in #167


</Project>
2 changes: 0 additions & 2 deletions src/NuGet.Build.Packaging.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<ThisAssemblyProjectProperty Include="PackageVersion" />
</ItemGroup>

<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets')" />

<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<NuGetPackagingTargetsImported>true</NuGetPackagingTargetsImported>
Expand Down