Skip to content

Commit

Permalink
Merge branch 'bug_43_CSharp_targets_inconsistent' of https://github.c…
Browse files Browse the repository at this point in the history
…om/bradtwurst/ncqrs into bradtwurst-bug_43_CSharp_targets_inconsistent

Conflicts:
	Samples/MyNotes/src/Website/Website.csproj
  • Loading branch information
pjvds committed Mar 15, 2011
2 parents 4dd94bc + 404f844 commit 1e9d605
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Name>Ncqrs.Eventing.Storage.WindowsAzure</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
4 changes: 2 additions & 2 deletions Samples/MyNotes/src/Website/Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<Name>ReadModel</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down Expand Up @@ -170,4 +170,4 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>

0 comments on commit 1e9d605

Please sign in to comment.