Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb280da9

Browse files
committed
convert FSharp.Editor to the dotnet SDK
1 parenta37642b commitb280da9

18 files changed

+469
-204
lines changed

‎FSharp.Directory.Build.props‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<Project>
2+
3+
<ImportProject="build\targets\PackageVersions.props" />
4+
<ImportProject="build\targets\CommonPackages.targets" />
5+
6+
<!-- directory locations-->
7+
<PropertyGroup>
8+
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10+
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11+
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
14+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
15+
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
16+
<OutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
17+
<IntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj\$(MSBuildProjectName)\</IntermediateOutputPath>
18+
</PropertyGroup>
19+
20+
<!-- nuget-->
21+
<PropertyGroup>
22+
<!-- default NuGet package restore location-->
23+
<NugetPackageRootCondition="'$(NugetPackageRoot)' == ''">$(UserProfile)\.nuget\packages\</NugetPackageRoot>
24+
</PropertyGroup>
25+
26+
<!-- signing-->
27+
<PropertyGroup>
28+
<SkipSigning>false</SkipSigning>
29+
<SignAssembly>true</SignAssembly>
30+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
31+
<StrongNames>true</StrongNames>
32+
<DelaySign>true</DelaySign>
33+
</PropertyGroup>
34+
35+
<!-- mono-->
36+
<PropertyGroup>
37+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
38+
</PropertyGroup>
39+
40+
<!-- localization-->
41+
<PropertyGroup>
42+
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
43+
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
44+
</PropertyGroup>
45+
46+
<!-- other-->
47+
<PropertyGroup>
48+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
49+
<UseStandardResourceNames>false</UseStandardResourceNames>
50+
</PropertyGroup>
51+
52+
<!-- SDK targets override-->
53+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
54+
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
55+
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
56+
</PropertyGroup>
57+
58+
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ProjectNameCondition="'$(ProjectName)' == ''">$(AssemblyName)</ProjectName>
5+
<ProjectNameCondition="'$(ProjectName)' == ''">$(MSBuildProjectName)</ProjectName>
6+
<DocumentationFile>$(OutputPath)\$(ProjectName).xml</DocumentationFile>
7+
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
8+
</PropertyGroup>
9+
10+
<ImportProject="build\targets\AssemblyVersions.props" />
11+
<ImportProject="build\targets\GitHash.props" />
12+
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
13+
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
14+
15+
</Project>

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.LanguageService", "v
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
2020
EndProject
21-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
21+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
2222
EndProject
2323
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="ProjectSystem.Base","vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj","{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}"
2424
EndProject
@@ -226,10 +226,10 @@ Global
226226
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|Any CPU.Build.0=Debug|Any CPU
227227
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|x86.ActiveCfg=Debug|Any CPU
228228
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|x86.Build.0=Debug|Any CPU
229-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
230-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.Build.0=Proto|Any CPU
231-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.ActiveCfg=Proto|Any CPU
232-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.Build.0=Proto|Any CPU
229+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.ActiveCfg=Release|Any CPU
230+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.Build.0=Release|Any CPU
231+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.ActiveCfg=Release|Any CPU
232+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.Build.0=Release|Any CPU
233233
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|Any CPU.ActiveCfg=Release|Any CPU
234234
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|Any CPU.Build.0=Release|Any CPU
235235
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|x86.ActiveCfg=Release|Any CPU

‎build-everything.proj‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3535
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
3636
</ItemGroup>
37+
<PropertyGroup>
38+
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
</PropertyGroup>
3740

3841
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
3942
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
@@ -78,17 +81,19 @@
7881
<ItemGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'" >
7982
<ProjectsWithCoreClrInclude="tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj" />
8083
<ProjectsWithCoreClrInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
81-
82-
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
8384
</ItemGroup>
85+
<PropertyGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'">
86+
<RestorePEVerify>true</RestorePEVerify>
87+
</PropertyGroup>
8488

8589
<ItemGroupCondition="'$(TEST_NET40_FSHARPQA_SUITE)'=='1' OR '$(TEST_NET40_FSHARP_SUITE)'=='1'" >
8690
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/ILComparer/ILComparer.fsproj" />
8791
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj" />
8892
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
89-
90-
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
9193
</ItemGroup>
94+
<PropertyGroupCondition="'$(TEST_NET40_FSHARPQA_SUITE)'=='1' OR '$(TEST_NET40_FSHARP_SUITE)'=='1'">
95+
<RestorePEVerify>true</RestorePEVerify>
96+
</PropertyGroup>
9297

9398
<ItemGroupCondition="'$(TEST_FCS)'=='1'" >
9499
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
@@ -102,6 +107,11 @@
102107
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
103108
</ItemGroup>
104109

110+
<ItemGroup>
111+
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
112+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
113+
</ItemGroup>
114+
105115
<PropertyGroup>
106116
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
107117
</PropertyGroup>
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
<!-- Version number computation-->
3+
<PropertyGroup>
4+
<!-- Put build number 0 and today's date if this was a local build-->
5+
<BUILD_BUILDNUMBERCondition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
6+
7+
<!--
8+
Given $(BUILD_BUILDNUMBER) = '20161225.1'
9+
10+
Then $(_Build_Year) = 2016
11+
Then $(_Build_Month) = 12
12+
Then $(_Build_Day) = 25
13+
Then $(_Build_Number) = 1
14+
Then $(Build_FileVersion) = 2016.12.25.1
15+
-->
16+
<_Build_Year>$(BUILD_BUILDNUMBER.Substring(0, 4))</_Build_Year>
17+
<_Build_Month>$(BUILD_BUILDNUMBER.Substring(4, 2))</_Build_Month>
18+
<_Build_Day>$(BUILD_BUILDNUMBER.Substring(6, 2))</_Build_Day>
19+
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
20+
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
21+
22+
<FSCoreVersion>4.4.1.0</FSCoreVersion>
23+
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
24+
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
25+
26+
<!--
27+
28+
Given $(BUILD_BUILDNUMBER) = '20161225.1'
29+
Given $(MicroBuildAssemblyVersion) = '15.4.1.0'
30+
31+
Then $(BuildTimeStamp_Day) = 161225
32+
Then $(BuildTimeStamp_Number) = 01
33+
Then $(BuildTimeStamp) = 16122501
34+
Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1
35+
Then $(VsixPackageVersion) = 15.4.1.16122501
36+
37+
-->
38+
<BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>
39+
<BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
40+
<BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>
41+
<MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>
42+
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
43+
</PropertyGroup>
44+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
3+
<ItemGroup>
4+
<PackageReferenceInclude="XliffTasks"Version="$(XliffTasksPackageVersion)" />
5+
</ItemGroup>
6+
7+
</Project>
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<Project>
2+
3+
<TargetName="GenerateAssemblyFileVersion"
4+
BeforeTargets="CoreCompile">
5+
6+
<PropertyGroup>
7+
<GeneratedFSharpAssemblyVersionFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyVersionFile>
8+
<!-- AssemblyInformationalVersionAttribute issues a by-design warning if the value passed isn't of the form #.#.#.#, but we specifically want to suppress this to allow the commit hash to be embedded.-->
9+
<NoWarnCondition="'$(Language)' == 'F#'">2003;$(NoWarn)</NoWarn>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<!-- xbuild and older versions of msbuild don't have F# support for WriteCodeFragment-->
14+
<_UseWriteCodeFragmentHackCondition="'$(OS)' == 'Unix' and '$(Language)' == 'F#'">true</_UseWriteCodeFragmentHack>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyCompanyAttribute">
19+
<_Parameter1>Microsoft Corporation</_Parameter1>
20+
</_AssemblyVersionAttributes>
21+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyCopyrightAttribute">
22+
<_Parameter1>&#169; Microsoft Corporation. All Rights Reserved.</_Parameter1>
23+
</_AssemblyVersionAttributes>
24+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyDescriptionAttribute">
25+
<_Parameter1>$(AssemblyName)</_Parameter1>
26+
</_AssemblyVersionAttributes>
27+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyFileVersionAttribute">
28+
<_Parameter1>$(Build_FileVersion)</_Parameter1>
29+
</_AssemblyVersionAttributes>
30+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyInformationalVersionAttribute">
31+
<_Parameter1>$(MicroBuildAssemblyVersion). Commit Hash: $(GitHeadSha).</_Parameter1>
32+
</_AssemblyVersionAttributes>
33+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyProductAttribute">
34+
<_Parameter1>Microsoft&#174; F#</_Parameter1>
35+
</_AssemblyVersionAttributes>
36+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyTitleAttribute">
37+
<_Parameter1>$(AssemblyName)</_Parameter1>
38+
</_AssemblyVersionAttributes>
39+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyVersionAttribute">
40+
<_Parameter1>$(MicroBuildAssemblyVersion)</_Parameter1>
41+
</_AssemblyVersionAttributes>
42+
</ItemGroup>
43+
44+
<ItemGroupCondition="'$(_UseWriteCodeFragmentHack)' == 'true'">
45+
<_LinesToWriteInclude="//&lt;auto-generated&gt;" />
46+
<_LinesToWriteInclude="namespace FSharp" />
47+
<_LinesToWriteInclude="open System" />
48+
<_LinesToWriteInclude="open System.Reflection" />
49+
<_LinesToWriteInclude="[&lt;assembly: %(_AssemblyVersionAttributes.Identity)(&quot;%(_AssemblyVersionAttributes._Parameter1)&quot;)&gt;]" />
50+
<_LinesToWriteInclude="do()" />
51+
52+
<CompileInclude="$(GeneratedFSharpAssemblyVersionFile)"Condition="'$(Language)' != 'F#' or '$(AssemblyName)' == 'FSharp.Core'" />
53+
<CompileBeforeInclude="$(GeneratedFSharpAssemblyVersionFile)"Condition="'$(Language)' == 'F#' and '$(AssemblyName)' != 'FSharp.Core'" />
54+
<FileWritesInclude="$(GeneratedFSharpAssemblyVersionFile)" />
55+
</ItemGroup>
56+
57+
<WriteCodeFragmentAssemblyAttributes="@(_AssemblyVersionAttributes)"
58+
Language="$(Language)"
59+
OutputFile="$(GeneratedFSharpAssemblyVersionFile)"
60+
Condition="'$(_UseWriteCodeFragmentHack)' != 'true'">
61+
<!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings)-->
62+
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(Language)' != 'F#' or '$(AssemblyName)' == 'FSharp.Core'" />
63+
<!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file-->
64+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(Language)' == 'F#' and '$(AssemblyName)' != 'FSharp.Core'" />
65+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
66+
</WriteCodeFragment>
67+
68+
<WriteLinesToFileFile="$(GeneratedFSharpAssemblyVersionFile)"
69+
Lines="@(_LinesToWrite)"
70+
Overwrite="true"
71+
Encoding="Unicode"
72+
Condition="'$(_UseWriteCodeFragmentHack)' == 'true' and !Exists('$(GeneratedFSharpAssemblyVersionFile)')" />
73+
74+
</Target>
75+
76+
</Project>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<GeneratedFSharpInternalsVisibleToFile>$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedFSharpInternalsVisibleToFile>
5+
</PropertyGroup>
6+
7+
<ItemDefinitionGroup>
8+
<InternalsVisibleTo>
9+
<Visible>false</Visible>
10+
</InternalsVisibleTo>
11+
</ItemDefinitionGroup>
12+
13+
<TargetName="PrepareFSharpGenerateInternalsVisibleToFile"
14+
Condition="'@(InternalsVisibleTo)' != ''">
15+
<PropertyGroupCondition="'$(MonoPackaging)' != 'true'">
16+
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293</_PublicKey>
17+
</PropertyGroup>
18+
<PropertyGroupCondition="'$(MonoPackaging)' == 'true'">
19+
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee</_PublicKey>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<_InternalsVisibleToAttributeInclude="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
23+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)</_Parameter1>
24+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' == ''">%(InternalsVisibleTo.Identity), PublicKey=$(_PublicKey)</_Parameter1>
25+
</_InternalsVisibleToAttribute>
26+
</ItemGroup>
27+
</Target>
28+
29+
<TargetName="GenerateFSharpInternalsVisibleToFile"
30+
Inputs="$(MSBuildProjectFile)"
31+
Outputs="$(GeneratedFSharpInternalsVisibleToFile)"
32+
DependsOnTargets="PrepareFSharpGenerateInternalsVisibleToFile;PrepareForBuild"
33+
Condition="'@(InternalsVisibleTo)' != ''"
34+
BeforeTargets="CoreCompile">
35+
<WriteCodeFragmentAssemblyAttributes="@(_InternalsVisibleToAttribute)"
36+
Language="$(Language)"
37+
OutputFile="$(GeneratedFSharpInternalsVisibleToFile)">
38+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore" />
39+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
40+
</WriteCodeFragment>
41+
</Target>
42+
43+
</Project>

‎build/targets/GitHash.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Copied from RepoToolset. Might be slightly modified to adjust for the current F#
1414
-->
1515

1616
<PropertyGroup>
17-
<RepoRoot>$(MSBuildThisFileDirectory)..\..\</RepoRoot>
17+
<RepoRootCondition="'$(RepoRoot)' == ''">$(MSBuildThisFileDirectory)..\..\</RepoRoot>
1818
</PropertyGroup>
1919

2020
<Choose>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp