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

Commit07774cb

Browse files
authored
clean up fsharp.core nuget usage (#3190)
1 parentd12aad7 commit07774cb

File tree

7 files changed

+24
-41
lines changed

7 files changed

+24
-41
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<packageSources>
88
<!--To inherit the global NuGet package sources remove the <clear/> line below-->
99
<clear />
10+
<addkey="artifacts"value="../artifacts" />
11+
<addkey="artifacts"value="../artifacts/4.2" />
1012
<addkey="myget.org fsharp-daily"value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1113
<addkey="myget.org roslyn-master-nightly"value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
1214
<addkey="dotnet-core"value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
@@ -15,7 +17,6 @@
1517
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1618
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1719
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
18-
<addkey="artifacts"value="../artifacts" />
1920
</packageSources>
2021

2122
</configuration>

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,18 @@
5454
<HintPathCondition="'$(TargetDotnetProfile)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
5555
<HintPathCondition="'$(TargetDotnetProfile)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
5656
</Reference>
57-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
58-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
59-
<Name>FSharp.Core</Name>
60-
</ProjectReference>
6157
<ReferenceInclude="System.ValueTuple">
6258
<HintPathCondition=" '$(TargetDotnetProfile)' == 'profile47'">..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
6359
<HintPathCondition=" '$(TargetDotnetProfile)' != 'profile47'">..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
6460
<Private>True</Private>
6561
</Reference>
6662
</ItemGroup>
63+
<ItemGroup>
64+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
65+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
66+
<Name>FSharp.Core</Name>
67+
</ProjectReference>
68+
</ItemGroup>
6769
<ItemGroupCondition="(!$(TargetDotnetProfile.Contains('portable'))) and '$(TargetDotnetProfile)' != 'coreclr'">
6870
<ReferenceInclude="mscorlib" />
6971
<ReferenceInclude="System" />

‎src/fsharp/FSharp.Core.Unittests/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"dependencies": {
99
"nunit":"3.5.0",
1010
"nunitlite":"3.5.0",
11-
"FSharp.Core.netcore":"1.0.0-rc-*",
1211
"System.ValueTuple":"4.3.1",
1312
"FsCheck":"2.6.2",
1413
"Microsoft.FSharp.TupleSample":"1.0.0-alpha-161112"

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,22 @@
3838
DependsOnTargets="CreateOrUpdateBuildVersionFile"
3939
AfterTargets="Build"
4040
Inputs="@(PackageNuspec)"
41-
Outputs='$(FSharpSourcesRoot)\$(Configuration)\artifacts\$(PackageVersion)\"%(PackageNuspec.Filename)).nupkg'>
41+
Outputs='$(FSharpSourcesRoot)\$(Configuration)\artifacts\$(PackageMajorVersion)\"%(PackageNuspec.Filename)).nupkg'>
4242

4343
<PropertyGroup>
4444
<PackageVersion>X.X.XXX</PackageVersion>
4545
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41Version)</PackageVersion>
46+
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">4.1</PackageMajorVersion>
4647
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">$(FSharpCore42Version)</PackageVersion>
48+
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">4.2</PackageMajorVersion>
4749
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
4850
</PropertyGroup>
4951

50-
<MakeDirDirectories="$(FSharpSourcesRoot)\..\artifacts\$(PackageVersion)" />
51-
<MakeDirDirectories="$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\$(PackageVersion)" />
52-
<ExecCommand='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(FSharpSourcesRoot)\..\$(Configuration) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\artifacts\$(PackageVersion)' />
53-
<ExecCommand='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(FSharpSourcesRoot)\..\$(Configuration) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\$(Configuration)\artifacts\$(PackageVersion)' />
52+
<MakeDirDirectories="$(FSharpSourcesRoot)\..\artifacts\$(PackageMajorVersion)" />
53+
<MakeDirDirectories="$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\$(PackageMajorVersion)" />
54+
55+
<ExecCommand='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(FSharpSourcesRoot)\..\$(Configuration) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\artifacts\$(PackageMajorVersion)' />
56+
<ExecCommand='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(FSharpSourcesRoot)\..\$(Configuration) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\$(Configuration)\artifacts\$(PackageMajorVersion)' />
5457
</Target>
5558

5659
</Project>

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
45
<PropertyGroup>
56
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
67
<ProjectLanguage>FSharp</ProjectLanguage>
78
</PropertyGroup>
9+
810
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
11+
912
<PropertyGroup>
1013
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
1114
<ProjectGuid>{DED3BBD7-53F4-428A-8C9F-27968E768605}</ProjectGuid>
@@ -25,17 +28,6 @@
2528
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable259'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
2629
</PropertyGroup>
2730

28-
<!-- Nuget packaging configuration-->
29-
<ItemGroup>
30-
<PackageNuspecInclude="FSharp.Core.netcore.nuspec"Condition="'$(TargetDotnetProfile)' == 'coreclr'" />
31-
<NoneInclude="FSharp.Core.runtimeconfig.json"Condition="'$(TargetDotnetProfile)' == 'coreclr'" ><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
32-
</ItemGroup>
33-
<PropertyGroup>
34-
<PackageVersionCondition="'$(PreReleaseLabel)' == ''">$(NuGeReleaseVersion)</PackageVersion>
35-
<PackageVersionCondition="'$(PackageVersionMinor)' != ''">$(PackageVersionMajor)-$(PackageVersionMinor)</PackageVersion>
36-
<PackageVersionCondition="'$(PackageVersionMinor)' == ''">$(NuGetPerBuildPreReleaseVersion)-0</PackageVersion>
37-
</PropertyGroup>
38-
3931
<ItemGroup>
4032
<FilesToLocalizeInclude="$(OutDir)$(AssemblyName).dll">
4133
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
@@ -283,20 +275,4 @@
283275
</ItemGroup>
284276
</Target>
285277

286-
<TargetName="nugetpack"
287-
DependsOnTargets="CreateOrUpdateBuildVersionFile"
288-
AfterTargets="Build"
289-
Condition="'$(TargetDotnetProfile)' == 'coreclr'"
290-
Inputs="@(PackageNuspec)"
291-
Outputs='$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'>
292-
293-
<PropertyGroup>
294-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
295-
</PropertyGroup>
296-
297-
<MakeDirDirectories="$(FSharpSourcesRoot)\..\artifacts" />
298-
<SetEnvVarName="NUGET_PACKAGES"Value="$(NUGET_PACKAGES)" />
299-
<ExecCommand='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(OutputPath.TrimEnd("\")) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\artifacts' />
300-
</Target>
301-
302278
</Project>

‎tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
5050
<Name>FSharp.Compiler.Private</Name>
5151
</ProjectReference>
52+
</ItemGroup>
53+
<ItemGroup>
5254
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
5355
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
5456
<Name>FSharp.Core</Name>

‎tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"emitEntryPoint":true
77
},
88
"dependencies": {
9+
"NETStandard.Library":"1.6.1",
10+
"FSharp.Core":"4.2.*",
911
"nunit":"3.5.0",
10-
"nunitlite":"3.5.0",
11-
"FSharp.Core.netcore":"1.0.0-rc-*",
12-
"System.Runtime":"4.3.0"
12+
"nunitlite":"3.5.0"
1313
},
1414
"runtimes": {
1515
"win7-x86": {},

0 commit comments

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