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

Commit5872b44

Browse files
authored
Rename TargetFramework in our build to TargetDotnetProfile (#3167)
* dotnet SDK uses the msbuild TargetFramework property, so we need to change our build a bit. Renaming it to TargetDotnetProfile in our files* Overeager renaming* Don't forget the mono stuff
1 parenta11ac80 commit5872b44

File tree

58 files changed

+228
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+228
-218
lines changed

‎build-everything.proj‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
5858
</ItemGroup>
5959

60-
<ItemGroupCondition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1' and ('$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259')" >
60+
<ItemGroupCondition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1' and ('$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259')" >
6161
<ProjectsWithPortableFrameworksInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
6262
</ItemGroup>
6363

@@ -85,38 +85,38 @@
8585
<!-- +++++++++++++++++++++++ Targets +++++++++++++++++++++++++++++++-->
8686

8787
<TargetName="Build">
88-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
89-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
90-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
91-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
92-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
93-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=xamarinmacmobile;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
94-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=monoandroid10+monotouch10+xamarinios10;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
95-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
88+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
89+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
90+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
91+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
92+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
93+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=xamarinmacmobile;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
94+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
95+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
9696
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
9797
<MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
9898
</Target>
9999

100100
<TargetName="Rebuild">
101-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
102-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
103-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
104-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
105-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
106-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
107-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
101+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
102+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
103+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
104+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
105+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
106+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
107+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
108108
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
109109
<MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
110110
</Target>
111111

112112
<TargetName="Clean">
113-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
114-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
115-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
116-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
117-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
118-
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
119-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
113+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
114+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
115+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
116+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
117+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
118+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
119+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
120120
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
121121
<MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
122122
</Target>

‎mono/build.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ set TEST_PORTABLE_COREUNIT_SUITE=1
3131

3232
%_ngenexe% install Proto\net440\bin\fsc-proto.exe
3333

34-
%_msbuildexe%%msbuildflags% build-everything.proj /p:TargetFramework=net40 /p:Configuration=Release
35-
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed&&goto :failure
34+
%_msbuildexe%%msbuildflags% build-everything.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release
35+
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release" failed&&goto :failure
3636

37-
%_msbuildexe%%msbuildflags% src/fsharp/FSharp.Core/FSharp.Core.fsproj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono\mono.snk
38-
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk" failed&&goto :failure
37+
%_msbuildexe%%msbuildflags% src/fsharp/FSharp.Core/FSharp.Core.fsproj /p:TargetDotnetProfile=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono\mono.snk
38+
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk" failed&&goto :failure
3939

4040

4141
@echo"Finished"

‎mono/config.make.in‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,75 +23,75 @@ xamarinmacenabled := @XAMARINMACENABLED@
2323

2424
monodir := ${libdir}mono
2525

26-
TargetFramework = net40
26+
TargetDotnetProfile = net40
2727
CONFIG = release
2828
Configuration = Release
2929
DISTVERSION = 201011
3030

3131
# Version number mappings for various versions of FSharp.Core
3232

33-
ifeq (x-$(TargetFramework)-,x-net40-)
33+
ifeq (x-$(TargetDotnetProfile)-,x-net40-)
3434

3535
ifeq (x-$(FSharpCoreBackVersion)-,x--)
3636
VERSION = 4.4.1.0
3737
PKGINSTALL = yes
3838
REFASSEMPATH = .NETFramework/v4.0
39-
outsuffix = $(TargetFramework)
39+
outsuffix = $(TargetDotnetProfile)
4040
endif
4141

4242
ifeq (x-$(FSharpCoreBackVersion)-,x-3.0-)
4343
VERSION = 4.3.0.0
4444
REFASSEMPATH = .NETFramework/v4.0
45-
outsuffix = fsharp30/$(TargetFramework)
45+
outsuffix = fsharp30/$(TargetDotnetProfile)
4646
endif
4747

4848
ifeq (x-$(FSharpCoreBackVersion)-,x-3.1-)
4949
VERSION = 4.3.1.0
5050
REFASSEMPATH = .NETFramework/v4.0
51-
outsuffix = fsharp31/$(TargetFramework)
51+
outsuffix = fsharp31/$(TargetDotnetProfile)
5252
endif
5353

5454
ifeq (x-$(FSharpCoreBackVersion)-,x-4.0-)
5555
VERSION = 4.4.0.0
5656
REFASSEMPATH = .NETFramework/v4.0
57-
outsuffix = fsharp40/$(TargetFramework)
57+
outsuffix = fsharp40/$(TargetDotnetProfile)
5858
endif
5959

6060
endif
6161

62-
ifeq (x-$(TargetFramework)-,x-monoandroid10+monotouch10+xamarinios10-)
62+
ifeq (x-$(TargetDotnetProfile)-,x-monoandroid10+monotouch10+xamarinios10-)
6363
VERSION = 3.98.41.0
64-
outsuffix = $(TargetFramework)
64+
outsuffix = $(TargetDotnetProfile)
6565
endif
6666

6767

68-
ifeq (x-$(TargetFramework)-,x-xamarinmacmobile-)
68+
ifeq (x-$(TargetDotnetProfile)-,x-xamarinmacmobile-)
6969
VERSION = 3.99.41.0
70-
outsuffix = $(TargetFramework)
70+
outsuffix = $(TargetDotnetProfile)
7171
endif
7272

73-
ifeq (x-$(TargetFramework)-,x-portable47-)
73+
ifeq (x-$(TargetDotnetProfile)-,x-portable47-)
7474
VERSION = 3.47.41.0
7575
PCLPATH = .NETPortable
76-
outsuffix = $(TargetFramework)
76+
outsuffix = $(TargetDotnetProfile)
7777
endif
7878

79-
ifeq (x-$(TargetFramework)-,x-portable7-)
79+
ifeq (x-$(TargetDotnetProfile)-,x-portable7-)
8080
VERSION = 3.7.41.0
8181
PCLPATH = .NETCore
82-
outsuffix = $(TargetFramework)
82+
outsuffix = $(TargetDotnetProfile)
8383
endif
8484

85-
ifeq (x-$(TargetFramework)-,x-portable78-)
85+
ifeq (x-$(TargetDotnetProfile)-,x-portable78-)
8686
VERSION = 3.78.41.0
8787
PCLPATH = .NETCore
88-
outsuffix = $(TargetFramework)
88+
outsuffix = $(TargetDotnetProfile)
8989
endif
9090

91-
ifeq (x-$(TargetFramework)-,x-portable259-)
91+
ifeq (x-$(TargetDotnetProfile)-,x-portable259-)
9292
VERSION = 3.259.41.0
9393
PCLPATH = .NETCore
94-
outsuffix = $(TargetFramework)
94+
outsuffix = $(TargetDotnetProfile)
9595
endif
9696

9797

‎setup/FSharp.Setup.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</PropertyGroup>
2020

2121
<PropertyGroup>
22-
<TargetFrameworkCondition=" '$(TargetFramework)' == ''">net40</TargetFramework>
22+
<TargetDotnetProfileCondition=" '$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
2323
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
2424
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
2525
</PropertyGroup>
2626

2727
<PropertyGroup>
2828
<BinariesDir>$(SetupRootFolder)\..\$(Configuration)</BinariesDir>
29-
<VsixBuildLocation>$(BinariesDir)\$(TargetFramework)\bin</VsixBuildLocation>
29+
<VsixBuildLocation>$(BinariesDir)\$(TargetDotnetProfile)\bin</VsixBuildLocation>
3030
<InsertionDir>$(BinariesDir)\insertion</InsertionDir>
3131
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
3232
<OutputPathCondition="'$(Lang)' == ''">$(BinariesDir)\setup</OutputPath>

‎setup/fsharp-setup-build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<SetupRootFolder>.</SetupRootFolder>
8-
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
8+
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
99
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
1010
</PropertyGroup>
1111

‎src/FSharpSource.Settings.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PropertyGroup>
2222
<!-- Settings used all the time-->
2323
<Tailcalls>true</Tailcalls>
24-
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
24+
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
2525

2626
<!-- Currently always use .NET Framwork proto compiler-->
2727
<ProtoFlavourCondition="'$(ProtoFlavour)' == ''">net40</ProtoFlavour>
@@ -42,9 +42,9 @@
4242
<MicrosoftVisualStudioThreadingVersion>15.0.240</MicrosoftVisualStudioThreadingVersion>
4343
<MicrosoftVisualStudioValidationVersion>15.0.82</MicrosoftVisualStudioValidationVersion>
4444

45-
<!-- Always qualify the IntermediateOutputPath by theTargetFramework if any exists-->
46-
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
47-
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetFramework)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
45+
<!-- Always qualify the IntermediateOutputPath by theTargetDotnetProfile if any exists-->
46+
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
47+
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
4848
</PropertyGroup>
4949

5050
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">
@@ -141,7 +141,7 @@
141141
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.5\tools</FsiToolPath>
142142
</PropertyGroup>
143143

144-
<ImportProject="../Tools/Build.Common.props"Condition="'$(TargetFramework)'=='coreclr'"/>
144+
<ImportProject="../Tools/Build.Common.props"Condition="'$(TargetDotnetProfile)'=='coreclr'"/>
145145
<ImportProject="$(BuildVersionFilePath)"Condition="Exists('$(BuildVersionFilePath)')" />
146146

147147
</Project>

0 commit comments

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