-
Notifications
You must be signed in to change notification settings - Fork 33
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
Add linked DLL references and remove copying #52
Open
nschonni
wants to merge
1
commit into
sass:master
Choose a base branch
from
nschonni:lib-ddl-ref
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,13 +10,15 @@ | |
<RootNamespace>LibSass</RootNamespace> | ||
<AssemblyName>LibSass.NET</AssemblyName> | ||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
<OutputPath>$(SolutionDir)bin\$(Configuration)\</OutputPath> | ||
<IntermediateOutputPath>$(SolutionDir)bin\$(Configuration)\obj\</IntermediateOutputPath> | ||
<OutputPath>bin\$(Configuration)\</OutputPath> | ||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> | ||
<ErrorReport>prompt</ErrorReport> | ||
<WarningLevel>4</WarningLevel> | ||
<Prefer32Bit>false</Prefer32Bit> | ||
<PlatformTarget>AnyCPU</PlatformTarget> | ||
<FileAlignment>512</FileAlignment> | ||
<LibSass32>$(SolutionDir)bin\$(Configuration)\libsass32.dll</LibSass32> | ||
<LibSass64>$(SolutionDir)bin\$(Configuration)\libsass64.dll</LibSass64> | ||
</PropertyGroup> | ||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
<DebugSymbols>true</DebugSymbols> | ||
|
@@ -66,16 +68,35 @@ | |
</ItemGroup> | ||
<ItemGroup> | ||
<None Include="LibSass.Net.nuspec" /> | ||
<None Include="libsassnet.targets" /> | ||
<None Include="libsassnet.targets"> | ||
<SubType>Designer</SubType> | ||
</None> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Reference Include="System" /> | ||
<Reference Include="System.Runtime.Serialization" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Content Include="$(LibSass32)"> | ||
<Link>libsass32.dll</Link> | ||
<CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
</Content> | ||
<Content Include="$(LibSass64)"> | ||
<Link>libsass64.dll</Link> | ||
<CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
</Content> | ||
</ItemGroup> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With #53, we have single libsass.dll now. However, this can be simplified to <Content Include="$(OutputPath)\libsass.*">
|
||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
<!-- Build LibSass --> | ||
<Target Name="AfterBuild"> | ||
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;TargetName=libsass32;OutDir=$(OutputPath);IntDir=$(IntermediateOutputPath)" /> | ||
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;TargetName=libsass64;OutDir=$(OutputPath);IntDir=$(IntermediateOutputPath)" /> | ||
<Target Name="BeforeBuild"> | ||
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;TargetName=libsass32;OutDir=$(SolutionDir)bin\$(Configuration)\;IntDir=$(SolutionDir)bin\$(Configuration)\obj\Win32\" Condition="!Exists('$(LibSass32)')" /> | ||
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;TargetName=libsass64;OutDir=$(SolutionDir)bin\$(Configuration)\;IntDir=$(SolutionDir)bin\$(Configuration)\obj\Win64\" Condition="!Exists('$(LibSass64)')" /> | ||
</Target> | ||
<Target Name="AfterClean"> | ||
<ItemGroup> | ||
<FilesToDelete Include="$(SolutionDir)bin\$(Configuration)\**\*"/> | ||
</ItemGroup> | ||
<Delete Files="@(FilesToDelete)" /> | ||
<RemoveDir Directories="$(SolutionDir)bin\$(Configuration)\" /> | ||
</Target> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is intentional to keep everything under
bin/
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the reason for that? This is the usual layout for projects.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's just better to have one output folder with all the intermediate stuff as normally happens in case of Unix. That's the reason I moved obj in bin during the rewrite. Otherwise, I have no strong preference. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I'm going to leave it for now, but I'll start to look at some of the Core stuff to see what they're doing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool, regarding that, I have been using DNX/Core for over an year now and have survived at least 5 era of upgrades (starting from DNX beta7) 😬. One thing you might notice that there is a lot of stuff already deprecated. So just skip whatever is older than a month or max two months old.
From tooling point of view, the key elements are:
https://github.com/dotnet/cli (command line utility which user and VS are using today to compile projects)
which depends on:
https://github.com/dotnet/core-setup (dotnet.exe aka muxer utility)
and:
https://github.com/dotnet/sdk (where the real magic is happening)
which has another dependent:
https://github.com/dotnet/roslyn-project-system (the new CPS based project system written for VS2017+ and above, see readme for more info)
Note that they are not only .NET Core tools, these tools are made so that they are backward and forward compatible and provide xplat support. For instance, we can potentially configure a project targeting multiple frameworks: v2, v3, v3.5, v4, v4.5, v4.6, netstandard1.1, netstandard1.3, netstandard1.5 and netstandard1.7 and build with a single command
dotnet build
ormsbuild mySolution.sln
.Think of SDK as an API, which CLI and RPS are implementing, but today VS2015 and command line usage, both are consuming the CLI as SDK is comparatively a new abstraction in the OSS toolset.
Also, upcoming msbuild v15 used in VS2017 is based on msbuild repo's default branch
xplat
instead ofmaster
. Both will be merged soon™️ butmaster
which is windows only is irrelevant. MSBuild is not under dotnet org (but Microsoft), as it has non-dotnet usages as well.We can further the discussion on Slack channel. Question is; are you READY? 😎