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

Commit23c626d

Browse files
authored
Build a compiler dll with out a prerelease tag (dotnet#6082)
1 parent0a72fe2 commit23c626d

File tree

8 files changed

+24
-5
lines changed

8 files changed

+24
-5
lines changed

‎build-nuget-packages.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ItemGroup>
55
<PackageProjectsInclude="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj"Condition="'$(BUILD_CORECLR)'=='1'" />
6+
<PackageProjectsInclude="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.Prerelease.csproj"Condition="'$(BUILD_CORECLR)'=='1'" />
67
<PackageProjectsInclude="src\fsharp\FSharp.Core\FSharp.Core.fsproj"Condition="'$(BUILD_NUGET)'=='1'" />
78
</ItemGroup>
89

‎build.cmd‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ if /i "%ARG%" == "net40" (
162162

163163
if /i"%ARG%"=="coreclr" (
164164
set_autoselect=0
165-
setBUILD_PROTO_WITH_CORECLR_LKG=1
166165
setBUILD_CORECLR=1
167166
setBUILD_FROMSOURCE=1
168167
)
@@ -237,7 +236,7 @@ if /i "%ARG%" == "nuget" (
237236

238237
setBUILD_PROTO=1
239238
setBUILD_NET40_FSHARP_CORE=1
240-
setBUILD_PROTO_WITH_CORECLR_LKG=1
239+
setBUILD_NET40=1
241240
setBUILD_CORECLR=1
242241
setBUILD_NUGET=1
243242
)

‎fsharp.proj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<BuildVSCondition="'$(BuildVS)' == ''">false</BuildVS>
1212
<BuildFCSCondition="'$(BuildFCS)' == ''">false</BuildFCS>
1313
<BuildSetupCondition="'$(BuildSetup)' == ''">false</BuildSetup>
14+
<BuildNugetCondition="'$(BuildNuget)' == ''">false</BuildNuget>
1415

1516
<TestCompilerCondition="'$(TestCompiler)' == ''">false</TestCompiler>
1617
<TestFSharpSuiteCondition="'$(TestFSharpSuite)' == ''">false</TestFSharpSuite>
@@ -25,6 +26,7 @@
2526
<BuildCompilerCondition="'$(BUILD_CORECLR)' == '1'">true</BuildCompiler>
2627
<BuildVSCondition="'$(BUILD_VS)' == '1'">true</BuildVS>
2728
<BuildFCSCondition="'$(BUILD_FCS)' == '1'">true</BuildFCS>
29+
<BuildNugetCondition="'$(BUILD_NUGET)' == '1' or '$(BUILD_SETUP)' == '1'">true</BuildNuget>
2830
<BuildSetupCondition="'$(BUILD_SETUP)' == '1'">true</BuildSetup>
2931

3032
<TestCompilerCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)' == '1'">true</TestCompiler>
@@ -98,8 +100,12 @@
98100
<ProjectsInclude="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCrackerTool.fsproj" />
99101
</ItemGroup>
100102

101-
<ItemGroupCondition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
103+
<ItemGroupCondition="'$(BuildNuget)' == 'true' OR '$(_RunningRestore)' == 'true'">
102104
<NugetProjectsInclude="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj" />
105+
<NugetProjectsInclude="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.Prerelease.csproj" />
106+
</ItemGroup>
107+
108+
<ItemGroupCondition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
103109
<ProjectsInclude="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
104110
</ItemGroup>
105111

‎src/fsharp/FSharp.Compiler.nuget/Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<PropertyGroup>
77
<TargetFramework>netcoreapp2.1</TargetFramework>
88
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
9-
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(NuGetPackageVersionSuffix)</PreReleaseSuffix>
10-
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
119
</PropertyGroup>
1210

1311
</Project>

‎src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<Project>
22

3+
<PropertyGroup>
4+
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(NuGetPackageVersionSuffix)</PreReleaseSuffix>
5+
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
6+
</PropertyGroup>
7+
38
<ImportProject="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
49
<ImportProject="$(MSBuildThisFileDirectory)..\Directory.Nuget.targets" />
510

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<PackageId>Microsoft.FSharp.Compiler</PackageId>
5+
<PreRelease>true</PreRelease>
6+
</PropertyGroup>
7+
8+
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<PackageId>Microsoft.FSharp.Compiler</PackageId>
5+
<PreRelease>false</PreRelease>
56
</PropertyGroup>
67

78
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<PackageId>Testing.FSharp.Compiler</PackageId>
5+
<PreRelease>true</PreRelease>
56
</PropertyGroup>
67

78
</Project>

0 commit comments

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