Skip to content

Commit 781675d

Browse files
author
Jonas Juselius
committed
Initial build fixes
1 parent aed3455 commit 781675d

File tree

5 files changed

+56
-60
lines changed

5 files changed

+56
-60
lines changed

‎.paket/Paket.Restore.targets

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!-- Prevent dotnet template engine to parse this file -->
3-
<PropertyGroup>
3+
<!--/-:cnd:noEmit-->
4+
<PropertyGroup>
45
<!-- make MSBuild track this file for incremental builds. -->
56
<!-- ref https://blogs.msdn.microsoft.com/msbuild/2005/09/26/how-to-ensure-changes-to-a-custom-target-file-prompt-a-rebuild/ -->
67
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
@@ -143,11 +144,12 @@
143144
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
144145
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
145146
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
147+
<CopyLocal>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
146148
</PaketReferencesFileLinesInfo>
147149
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
148150
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
149151
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
150-
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
152+
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
151153
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
152154
</PackageReference>
153155
</ItemGroup>
@@ -294,4 +296,5 @@
294296
NuspecBasePath="$(NuspecBasePath)"
295297
NuspecProperties="$(NuspecProperties)"/>
296298
</Target>
297-
</Project>
299+
<!--/+:cnd:noEmit-->
300+
</Project>

‎src/CsHanoi/CsHanoi.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
7-
8-
</Project>
7+
<Import Project="..\..\.paket\Paket.Restore.targets" />
8+
</Project>

‎src/FsByExample.sln

+39-44
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsHanoi", "CsHanoi\CsHanoi.csproj", "{CA1A17BF-0699-4892-A221-4795907E6CC2}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsHanoi", "CsHanoi\CsHanoi.csproj", "{1D48AAB5-BD65-484A-A166-8817380CBE5D}"
77
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsHanoi", "FsHanoi\FsHanoi.fsproj", "{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}"
8+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsHanoi", "FsHanoi\FsHanoi.fsproj", "{776FA67F-8347-49F0-847D-672D1989471F}"
99
EndProject
10-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsPoem", "FsPoem\FsPoem.fsproj", "{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}"
10+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsPoem", "FsPoem\FsPoem.fsproj", "{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,46 +22,41 @@ Global
2222
HideSolutionNode = FALSE
2323
EndGlobalSection
2424
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|x64.ActiveCfg = Debug|Any CPU
28-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|x64.Build.0 = Debug|Any CPU
29-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|x86.ActiveCfg = Debug|Any CPU
30-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Debug|x86.Build.0 = Debug|Any CPU
31-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|x64.ActiveCfg = Release|Any CPU
34-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|x64.Build.0 = Release|Any CPU
35-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|x86.ActiveCfg = Release|Any CPU
36-
{CA1A17BF-0699-4892-A221-4795907E6CC2}.Release|x86.Build.0 = Release|Any CPU
37-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|x64.ActiveCfg = Debug|Any CPU
40-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|x64.Build.0 = Debug|Any CPU
41-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|x86.ActiveCfg = Debug|Any CPU
42-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Debug|x86.Build.0 = Debug|Any CPU
43-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|x64.ActiveCfg = Release|Any CPU
46-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|x64.Build.0 = Release|Any CPU
47-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|x86.ActiveCfg = Release|Any CPU
48-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F}.Release|x86.Build.0 = Release|Any CPU
49-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|x64.ActiveCfg = Debug|Any CPU
52-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|x64.Build.0 = Debug|Any CPU
53-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|x86.ActiveCfg = Debug|Any CPU
54-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Debug|x86.Build.0 = Debug|Any CPU
55-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|x64.ActiveCfg = Release|Any CPU
58-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|x64.Build.0 = Release|Any CPU
59-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|x86.ActiveCfg = Release|Any CPU
60-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E}.Release|x86.Build.0 = Release|Any CPU
61-
EndGlobalSection
62-
GlobalSection(NestedProjects) = preSolution
63-
{CA1A17BF-0699-4892-A221-4795907E6CC2} = {D800F8D0-AECD-4698-A526-8A9D7C181F9E}
64-
{CC8D882B-A11E-4EAA-B42D-3B7DE611D47F} = {205127F8-3080-4930-BD46-927004C72128}
65-
{3B150D9B-F2DA-492F-9D4E-D24CA95E561E} = {205127F8-3080-4930-BD46-927004C72128}
25+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|x64.ActiveCfg = Debug|Any CPU
28+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|x64.Build.0 = Debug|Any CPU
29+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|x86.ActiveCfg = Debug|Any CPU
30+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Debug|x86.Build.0 = Debug|Any CPU
31+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|x64.ActiveCfg = Release|Any CPU
34+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|x64.Build.0 = Release|Any CPU
35+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|x86.ActiveCfg = Release|Any CPU
36+
{1D48AAB5-BD65-484A-A166-8817380CBE5D}.Release|x86.Build.0 = Release|Any CPU
37+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|x64.ActiveCfg = Debug|Any CPU
40+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|x64.Build.0 = Debug|Any CPU
41+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|x86.ActiveCfg = Debug|Any CPU
42+
{776FA67F-8347-49F0-847D-672D1989471F}.Debug|x86.Build.0 = Debug|Any CPU
43+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|x64.ActiveCfg = Release|Any CPU
46+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|x64.Build.0 = Release|Any CPU
47+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|x86.ActiveCfg = Release|Any CPU
48+
{776FA67F-8347-49F0-847D-672D1989471F}.Release|x86.Build.0 = Release|Any CPU
49+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|x64.ActiveCfg = Debug|Any CPU
52+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|x64.Build.0 = Debug|Any CPU
53+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|x86.ActiveCfg = Debug|Any CPU
54+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Debug|x86.Build.0 = Debug|Any CPU
55+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|x64.ActiveCfg = Release|Any CPU
58+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|x64.Build.0 = Release|Any CPU
59+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|x86.ActiveCfg = Release|Any CPU
60+
{46206AEA-29A1-4AEE-9A5D-5607BA5AD631}.Release|x86.Build.0 = Release|Any CPU
6661
EndGlobalSection
6762
EndGlobal

‎src/FsHanoi/FsHanoi.fsproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
6-
76
<ItemGroup>
87
<Compile Include="Library.fs" />
98
</ItemGroup>
10-
11-
</Project>
9+
<Import Project="..\..\.paket\Paket.Restore.targets" />
10+
</Project>

‎src/FsPoem/FsPoem.fsproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
7-
87
<ItemGroup>
98
<Compile Include="Program.fs" />
109
</ItemGroup>
11-
12-
</Project>
10+
<Import Project="..\..\.paket\Paket.Restore.targets" />
11+
</Project>

0 commit comments

Comments
 (0)