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

Commit7c07673

Browse files
authored
build nuget packages after signing (dotnet#4269)
1 parentdad172e commit7c07673

File tree

7 files changed

+71
-29
lines changed

7 files changed

+71
-29
lines changed

‎build-everything.proj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
2525
<ProjectsWithCoreClrInclude="src/fsharp/Fsc/Fsc.fsproj" />
2626
<ProjectsWithCoreClrInclude="src/fsharp/fsi/Fsi.fsproj" />
27-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
28-
</ItemGroup>
27+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj" />
28+
</ItemGroup>
2929

3030
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3131
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
@@ -47,10 +47,6 @@
4747
<SetupProjectsInclude="setup/fsharp-setup-build.proj" />
4848
</ItemGroup>
4949

50-
<ItemGroupCondition="'$(BUILD_NUGET)'=='1'">
51-
<NugetProjectsInclude="src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj" />
52-
</ItemGroup>
53-
5450
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
5551

5652
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >

‎build-nuget-packages.proj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
2+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
3+
4+
<ItemGroup>
5+
<PackageProjectsInclude="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.nuget.proj"Condition="'$(BUILD_CORECLR)'=='1'" />
6+
<PackageProjectsInclude="src\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.proj"Condition="'$(BUILD_NUGET)'=='1'" />
7+
</ItemGroup>
8+
9+
<TargetName="Build">
10+
<MSBuildProjects="@(PackageProjects)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
11+
</Target>
12+
13+
<TargetName="Rebuild">
14+
<MSBuildProjects="@(PackageProjects)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
15+
</Target>
16+
17+
<TargetName="Clean">
18+
<MSBuildProjects="@(PackageProjects)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
19+
</Target>
20+
21+
</Project>

‎build.cmd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,12 @@ if not "%SIGN_TYPE%" == "" (
686686
ifERRORLEVEL1echo Error running sign tool&&goto :failure
687687
)
688688

689+
echo ---------------- Done with assembly signing, start package creation ---------------
690+
691+
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
692+
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
693+
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
694+
689695
if"%BUILD_SETUP%"=="1" (
690696
echo%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
691697
%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
4+
<PreReleaseLabel>rc</PreReleaseLabel>
5+
<BuildVersionFilePathCondition="'$(BuildVersionFilePath)'==''" >obj\BuildVersionFile.props</BuildVersionFilePath>
6+
</PropertyGroup>
7+
8+
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
9+
10+
<PropertyGroup>
11+
<PackageLicenceUrlCondition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
12+
<PackageProjectUrlCondition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
13+
<PackageAuthorsCondition="'$(PackageAuthors)' == ''" >Microsoft and F# Software Foundation</PackageAuthors>
14+
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
15+
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
16+
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
17+
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
18+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
19+
</PropertyGroup>
20+
</Project>

‎src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj‎renamed to ‎src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.targets‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,4 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
4-
<PreReleaseLabel>rc</PreReleaseLabel>
5-
<BuildVersionFilePathCondition="'$(BuildVersionFilePath)'==''" >obj\BuildVersionFile.props</BuildVersionFilePath>
6-
</PropertyGroup>
7-
8-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
9-
10-
<PropertyGroup>
11-
<PackageLicenceUrlCondition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
12-
<PackageProjectUrlCondition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
13-
<PackageAuthorsCondition="'$(PackageAuthors)' == ''" >Microsoft and F# Software Foundation</PackageAuthors>
14-
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
15-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
16-
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
17-
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
18-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
19-
</PropertyGroup>
20-
21-
<ItemGroupCondition="'$(TargetDotnetProfile)' == 'coreclr'">
22-
<PackageNuspecInclude="Testing.FSharp.Compiler.nuspec" />
23-
<PackageNuspecInclude="Microsoft.FSharp.Compiler.nuspec" />
24-
</ItemGroup>
252

263
<ItemGroup>
274
<RefMarkerInclude="_._"></RefMarker>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<ImportProject="FSharp.Compiler.Template.nuget.props" />
4+
5+
<ItemGroup>
6+
<PackageNuspecInclude="Microsoft.FSharp.Compiler.nuspec" />
7+
</ItemGroup>
8+
9+
<ImportProject="FSharp.Compiler.Template.nuget.targets" />
10+
11+
</Project>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<ImportProject="FSharp.Compiler.Template.nuget.props" />
4+
5+
<ItemGroup>
6+
<PackageNuspecInclude="Testing.FSharp.Compiler.nuspec" />
7+
</ItemGroup>
8+
9+
<ImportProject="FSharp.Compiler.Template.nuget.targets" />
10+
11+
</Project>

0 commit comments

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