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

Commit6d50665

Browse files
authored
Enable Net Sdk to write project properties (dotnet#4430)
* Enable net sdk project properties to be set in assembly info* Add back removed file* correct version* typo
1 parent9639b2e commit6d50665

File tree

11 files changed

+70
-3
lines changed

11 files changed

+70
-3
lines changed

‎mono/config.make‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@ install-sdk-lib:
211211
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
212212
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
213213
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\
214+
\
215+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\
216+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/;\
217+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
218+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
219+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\
214220
fi
215221
@iftest x-$(outsuffix) = x-net40;then\
216222
iftest -e$(outdir)$(NAME).dll;then \

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<ComponentRefId="Compiler_Redist_Microsoft.Portable.FSharp.targets" />
1818
<ComponentRefId="Compiler_Redist_Microsoft.FSharp.NetSdk.props" />
1919
<ComponentRefId="Compiler_Redist_Microsoft.FSharp.NetSdk.targets" />
20+
<ComponentRefId="Compiler_Redist_Microsoft.FSharp.Overrides.NetSdk.targets" />
2021
<ComponentRefId="Compiler_Redist_SupportedRuntimes.xml" />
2122
<ComponentRefId="Compiler_Redist_RegistryKeys_CompilerLocation" />
2223

@@ -126,6 +127,10 @@
126127
<FileId="Compiler_Redist_Microsoft.FSharp.NetSdk.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.NetSdk.targets" />
127128
</Component>
128129

130+
<ComponentId="Compiler_Redist_Microsoft.FSharp.Overrides.NetSdk.targets"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.Overrides.NetSdk.targets, $(var.LocaleCode)))">
131+
<FileId="Compiler_Redist_Microsoft.FSharp.Overrides.NetSdk.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.Overrides.NetSdk.targets" />
132+
</Component>
133+
129134
<ComponentId="Compiler_Redist_SupportedRuntimes.xml"Guid="$(fsharp.guid(Compiler_Redist_SupportedRuntimes.xml, $(var.LocaleCode)))">
130135
<FileId="Compiler_Redist_SupportedRuntimes.xml"Source="$(var.FSharpTreeRoot)\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" />
131136
</Component>
@@ -140,6 +145,7 @@
140145
<RegistryValueName="Microsoft.Portable.FSharp.Targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.Portable.FSharp.Targets"Type="string" />
141146
<RegistryValueName="Microsoft.FSharp.NetSdk.props"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharp.NetSdk.props"Type="string" />
142147
<RegistryValueName="Microsoft.FSharp.NetSdk.targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharpNetSdk.targets"Type="string" />
148+
<RegistryValueName="Microsoft.FSharp.Overrides.NetSdk.targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.Overrides.FSharpNetSdk.targets"Type="string" />
143149
</RegistryKey>
144150
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\VisualStudio\15.0\Setup\F#"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
145151
<RegistryValueName="ProductDir"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]"Type="string" />

‎setup/Swix/Microsoft.FSharp.Dependencies/Files.swr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
77
file "Microsoft.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
88
file "Microsoft.Portable.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
99
file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.targets"
10+
file "Microsoft.FSharp.NetSdk.Overrides.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Overrides.NetSdk.Shim.targets"
1011
file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.props"
1112

1213
folder "InstallDir:Common7\IDE\PublicAssemblies"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<ImportProject="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\10.1\Framework\v4.0\Microsoft.FSharp.Overrides.NetSdk.targets" />
4+
5+
</Project>

‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
<Pattern1>{BuildSuffix}</Pattern1>
4747
<Replacement1></Replacement1>
4848
</CopyAndSubstituteText>
49+
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Overrides.NetSdk.targets">
50+
<TargetFilename>Microsoft.FSharp.Overrides.NetSdk.targets</TargetFilename>
51+
<Pattern1>{BuildSuffix}</Pattern1>
52+
<Replacement1></Replacement1>
53+
</CopyAndSubstituteText>
4954
</ItemGroup>
5055

5156
<ItemGroup>

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<NoneInclude="..\FSharp.Build\Microsoft.FSharp.NetSdk.targets"CopyToOutputDirectory="PreserveNewest">
5252
<Link>Microsoft.FSharp.NetSdk.targets</Link>
5353
</None>
54+
<NoneInclude="..\FSharp.Build\Microsoft.FSharp.Overrides.NetSdk.targets"CopyToOutputDirectory="PreserveNewest">
55+
<Link>Microsoft.FSharp.Overrides.NetSdk.targets</Link>
56+
</None>
5457
</ItemGroup>
5558
<ItemGroup>
5659
<ReferenceInclude="mscorlib" />

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<NoneInclude="Microsoft.Portable.FSharp.Targets"CopyToOutputDirectory="PreserveNewest" />
3838
<NoneInclude="Microsoft.FSharp.NetSdk.props"CopyToOutputDirectory="PreserveNewest" />
3939
<NoneInclude="Microsoft.FSharp.NetSdk.targets"CopyToOutputDirectory="PreserveNewest" />
40+
<NoneInclude="Microsoft.FSharp.Overrides.NetSdk.targets"CopyToOutputDirectory="PreserveNewest" />
4041
</ItemGroup>
4142

4243
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr'">
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
2+
3+
<!--
4+
***********************************************************************************************
5+
Microsoft.FSharp.Overrides.NetSdk.targets
6+
7+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
8+
created a backup copy. Incorrect changes to this file will make it
9+
impossible to load or build your projects from the command-line or the IDE.
10+
11+
***********************************************************************************************
12+
-->
13+
14+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
15+
16+
<PropertyGroup>
17+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
18+
</PropertyGroup>
19+
20+
<TargetName="CoreGenerateAssemblyInfo"
21+
Condition="'$(Language)'=='F#'"
22+
DependsOnTargets="CreateGeneratedAssemblyInfoInputsCacheFile"
23+
Inputs="$(GeneratedAssemblyInfoInputsCacheFile)"
24+
Outputs="$(GeneratedAssemblyInfoFile)">
25+
<ItemGroup>
26+
<!-- Ensure the generated assemblyinfo file is not already part of the Compile sources, as a workaround for https://github.com/dotnet/sdk/issues/114-->
27+
<CompileRemove="$(GeneratedAssemblyInfoFile)" />
28+
</ItemGroup>
29+
30+
<WriteCodeFragmentAssemblyAttributes="@(AssemblyAttribute)"Language="$(Language)"OutputFile="$(GeneratedAssemblyInfoFile)">
31+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore" />
32+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
33+
</WriteCodeFragment>
34+
</Target>
35+
36+
</Project>

‎src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@
4242
<filesinclude="any\any\default.win32manifest"buildAction="Content"copyToOutput="true"flatten="false" />
4343
<filesinclude="any\any\Microsoft.FSharp.Targets"buildAction="Content"copyToOutput="true"flatten="false" />
4444
<filesinclude="any\any\Microsoft.Portable.FSharp.targets"buildAction="Content"copyToOutput="true"flatten="false" />
45-
<filesinclude="any\any\Microsoft.FSharp.NetSdk.targets"buildAction="Content"copyToOutput="true"flatten="false" />
4645
<filesinclude="any\any\Microsoft.FSharp.NetSdk.props"buildAction="Content"copyToOutput="true"flatten="false" />
46+
<filesinclude="any\any\Microsoft.FSharp.NetSdk.targets"buildAction="Content"copyToOutput="true"flatten="false" />
47+
<filesinclude="any\any\Microsoft.FSharp.Overrides.NetSdk.targets"buildAction="Content"copyToOutput="true"flatten="false" />
4748
</contentFiles>
4849
</metadata>
4950
<files>
@@ -64,8 +65,9 @@
6465
<filesrc="default.win32manifest"target="contentFiles\any\any" />
6566
<filesrc="Microsoft.FSharp.Targets"target="contentFiles\any\any" />
6667
<filesrc="Microsoft.Portable.FSharp.Targets"target="contentFiles\any\any" />
67-
<filesrc="Microsoft.FSharp.NetSdk.targets"target="contentFiles\any\any" />
6868
<filesrc="Microsoft.FSharp.NetSdk.props"target="contentFiles\any\any" />
69+
<filesrc="Microsoft.FSharp.NetSdk.targets"target="contentFiles\any\any" />
70+
<filesrc="Microsoft.FSharp.Overrides.NetSdk.targets"target="contentFiles\any\any" />
6971

7072
<filesrc="**\FSharp.Core.resources.dll"target="lib\netstandard1.6" />
7173
<filesrc="**\FSharp.Compiler.Private.resources.dll"target="lib\netstandard1.6" />

‎src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@
5555
<filesrc="default.win32manifest"target="runtimes\any\native" />
5656
<filesrc="Microsoft.FSharp.Targets"target="runtimes\any\native" />
5757
<filesrc="Microsoft.Portable.FSharp.Targets"target="runtimes\any\native" />
58-
<filesrc="Microsoft.FSharp.NetSdk.targets"target="runtimes\any\native" />
5958
<filesrc="Microsoft.FSharp.NetSdk.props"target="runtimes\any\native" />
59+
<filesrc="Microsoft.FSharp.NetSdk.targets"target="runtimes\any\native" />
60+
<filesrc="Microsoft.FSharp.Overrides.NetSdk.targets"target="runtimes\any\native" />
6061

6162
<filesrc="**\FSharp.Core.resources.dll"target="lib\netstandard1.6" />
6263
<filesrc="**\FSharp.Compiler.Private.resources.dll"target="lib\netstandard1.6" />

0 commit comments

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