Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 948fbc2

Browse files
author
Livar
authored
Merge pull request #4940 from enricosada/fsharp_use_sdk_attribute_p4
use Sdk attribute in F# templates too (branch preview4)
2 parents 5239692 + 684c790 commit 948fbc2

File tree

7 files changed

+25
-40
lines changed

7 files changed

+25
-40
lines changed

‎build/Microsoft.DotNet.Cli.BundledSdks.proj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<Copy SourceFiles="@(SdkContent)"
1818
DestinationFiles="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
1919

20+
<!-- Remove unused directories for FSharp.NET.Sdk, just Sdk directory is needed -->
21+
<RemoveDir Condition=" '$([System.IO.Path]::GetFileName($(SdkLayoutDirectory)))' == 'FSharp.NET.Sdk' " Directories="$(SdkLayoutDirectory)/build;$(SdkLayoutDirectory)/buildCrossTargeting" />
22+
2023
<Message Text="Copied Sdk $(SdkPackageName) from $(SdkNuPkgPath) to $(SdkLayoutDirectory)."
2124
Importance="High" />
2225
</Target>

‎build/Microsoft.DotNet.Cli.BundledSdks.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
<BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(CLI_WEBSDK_Version)" />
99
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" />
1010
<BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(CLI_WEBSDK_Version)" />
11+
<BundledSdk Include="FSharp.NET.Sdk" Version="1.0.0-beta-040011" />
1112
</ItemGroup>
1213
</Project>

‎src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="15.0">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
32

43
<PropertyGroup>
54
<OutputType>Exe</OutputType>
@@ -15,10 +14,7 @@
1514
<ItemGroup>
1615
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
1716
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
18-
<PackageReference Include="Microsoft.NET.Sdk" Version="1.0.0-alpha-20161104-2">
19-
<PrivateAssets>All</PrivateAssets>
20-
</PackageReference>
21-
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-alpha-*">
17+
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">
2218
<PrivateAssets>All</PrivateAssets>
2319
</PackageReference>
2420
</ItemGroup>
@@ -29,6 +25,4 @@
2925
</DotNetCliToolReference>
3026
</ItemGroup>
3127

32-
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
33-
3428
</Project>

‎src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="15.0">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
32

43
<PropertyGroup>
54
<TargetFramework>netstandard1.6</TargetFramework>
@@ -14,10 +13,7 @@
1413
<ItemGroup>
1514
<PackageReference Include="NETStandard.Library" Version="1.6" />
1615
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
17-
<PackageReference Include="Microsoft.NET.Sdk" Version="1.0.0-alpha-20161104-2">
18-
<PrivateAssets>All</PrivateAssets>
19-
</PackageReference>
20-
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-alpha-*">
16+
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">
2117
<PrivateAssets>All</PrivateAssets>
2218
</PackageReference>
2319
</ItemGroup>
@@ -28,6 +24,4 @@
2824
</DotNetCliToolReference>
2925
</ItemGroup>
3026

31-
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
32-
3327
</Project>

‎src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="15.0">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
32

43
<PropertyGroup>
54
<OutputType>Exe</OutputType>
@@ -14,13 +13,10 @@
1413
<ItemGroup>
1514
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
1615
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
17-
<PackageReference Include="Microsoft.NET.Sdk" Version="1.0.0-alpha-20161104-2">
18-
<PrivateAssets>All</PrivateAssets>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161109-01" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
2117
<PackageReference Include="MSTest.TestAdapter" Version="1.1.5-preview" />
2218
<PackageReference Include="MSTest.TestFramework" Version="1.0.6-preview" />
23-
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-alpha-*">
19+
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">
2420
<PrivateAssets>All</PrivateAssets>
2521
</PackageReference>
2622
</ItemGroup>
@@ -31,5 +27,4 @@
3127
</DotNetCliToolReference>
3228
</ItemGroup>
3329

34-
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
35-
</Project>
30+
</Project>

‎src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="15.0">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project ToolsVersion="15.0" Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk.Web">
32

43
<PropertyGroup>
54
<OutputType>Exe</OutputType>
@@ -11,20 +10,26 @@
1110
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
1211
</PropertyGroup>
1312

13+
<PropertyGroup>
14+
<GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;jspm_packages\**;bower_components\**;**\*.user;**\*.*proj</GlobalExclude>
15+
</PropertyGroup>
16+
1417
<ItemGroup>
18+
<None Include="**\*" />
1519
<Compile Include="Controllers\*.fs" />
1620
<Compile Include="Startup.fs" />
1721
<Compile Include="Program.fs" />
1822
<EmbeddedResource Include="**\*.resx" />
23+
<Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" />
24+
<Content Include="**\*.cshtml" Exclude="wwwroot\**\*.cshtml" CopyToPublishDirectory="PreserveNewest" />
25+
<Content Include="**\*.config" Exclude="wwwroot\**\*.config" CopyToPublishDirectory="PreserveNewest" />
26+
<Content Include="**\*.json" Exclude="wwwroot\**\*.json" CopyToPublishDirectory="PreserveNewest" />
1927
</ItemGroup>
2028

2129
<ItemGroup>
2230
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
23-
<PackageReference Include="Microsoft.NET.Sdk.Web" Version="1.0.0-alpha-20161117-1-119">
24-
<PrivateAssets>All</PrivateAssets>
25-
</PackageReference>
2631
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
27-
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-alpha-*">
32+
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">
2833
<PrivateAssets>All</PrivateAssets>
2934
</PackageReference>
3035
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.0" />
@@ -49,5 +54,4 @@
4954
</DotNetCliToolReference>
5055
</ItemGroup>
5156

52-
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
5357
</Project>

‎src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="15.0">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk" ToolsVersion="15.0">
32

43
<PropertyGroup>
54
<OutputType>Exe</OutputType>
@@ -13,14 +12,11 @@
1312

1413
<ItemGroup>
1514
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
16-
<PackageReference Include="Microsoft.NET.Sdk" Version="1.0.0-alpha-20161104-2">
17-
<PrivateAssets>All</PrivateAssets>
18-
</PackageReference>
1915
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
2016
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
2117
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
2218
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
23-
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-alpha-*">
19+
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*">
2420
<PrivateAssets>All</PrivateAssets>
2521
</PackageReference>
2622
</ItemGroup>
@@ -31,6 +27,4 @@
3127
</DotNetCliToolReference>
3228
</ItemGroup>
3329

34-
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
35-
3630
</Project>

0 commit comments

Comments
 (0)