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

Commitfe0ff78

Browse files
authored
Freeze and deploy localized plibs (#3199)
1 parent24bd27e commitfe0ff78

File tree

6 files changed

+50
-14
lines changed

6 files changed

+50
-14
lines changed

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<packageid="FSharp.Compiler.Tools"version="4.1.5"/>
4343

4444
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
45-
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.18"/>
45+
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.20"/>
4646

4747
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
4848
<packageid="FSharp.Data"version="2.2.5" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@
5252
</DirectoryRef>
5353
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">
5454
<ComponentId="Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
55-
<FileId="Runtime_LangPack_3.47.41._FSharp.Core.resources.dll"Source="$(var.BinariesDir)\portable47\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
55+
<FileId="Runtime_LangPack_3.47.41._FSharp.Core.resources.dll"Source="$(var.BinariesDir)\profiles\portable-net45%2Bsl5%2Bnetcore45\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
5656
</Component>
5757
</DirectoryRef>
5858
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)">
5959
<ComponentId="Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
60-
<FileId="Runtime_LangPack_3.7.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\portable7\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
60+
<FileId="Runtime_LangPack_3.7.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\profiles\portable-net45%2Bnetcore45\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
6161
</Component>
6262
</DirectoryRef>
6363
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)">
6464
<ComponentId="Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
65-
<FileId="Runtime_LangPack_3.78.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\portable78\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
65+
<FileId="Runtime_LangPack_3.78.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\profiles\portable-net45%2Bnetcore45%2Bwp8\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
6666
</Component>
6767
</DirectoryRef>
6868
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)">
6969
<ComponentId="Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
70-
<FileId="Runtime_LangPack_3.259.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\portable259\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
70+
<FileId="Runtime_LangPack_3.259.41.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\profiles\portable-net45%2Bnetcore45%2Bwpa81%2Bwp8\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
7171
</Component>
7272
</DirectoryRef>
7373

‎src/FSharpSource.Settings.targets‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<BuildToolsTargets45>true</BuildToolsTargets45>
3232
<WarningsAsErrors />
3333
<FX_NO_LOADERCondition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>
34-
34+
3535
<RoslynVersion>2.0.0</RoslynVersion>
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
@@ -44,8 +44,10 @@
4444
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
4545
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
4646

47-
<FSharpCore41Version>4.1.18</FSharpCore41Version>
48-
<FSharpCore42Version>4.2.1</FSharpCore42Version>
47+
<FSharpCore41TargetVersion>4.1.18</FSharpCore41TargetVersion>
48+
<FSharpCore41FrozenPortableVersion>4.1.20</FSharpCore41FrozenPortableVersion>
49+
<FSharpCore41FrozenPortableTargetVersion>4.1.21</FSharpCore41FrozenPortableTargetVersion>
50+
<FSharpCore42TargetVersion>4.2.2</FSharpCore42TargetVersion>
4951
</PropertyGroup>
5052

5153
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<ItemGroup>
1919
<PackageNuspecInclude="FSharp.Core.4.2.xxx.nuspec" />
2020
<PackageNuspecInclude="FSharp.Core.4.1.xxx.nuspec" />
21+
<PackageNuspecInclude="Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec" />
2122
</ItemGroup>
2223

2324
<ItemGroup>
@@ -36,10 +37,10 @@
3637

3738
<TargetName="CopyFiles">
3839
<ItemGroup>
39-
<ProfilesInclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\*\*.*"
40-
Exclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\net45\*\*.*;$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\netstandard1.6\*\*.*" />
40+
<ProfilesInclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersion)\lib\**\*.*"
41+
Exclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersion)\lib\net45\**\*.*;$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersionm)\lib\netstandard1.6\**\*.*" />
4142
</ItemGroup>
42-
<CopySourceFiles="@(Profiles)"DestinationFolder="$(FSharpSourcesRoot)\..\$(Configuration)\profiles\%(RecursiveDir)" />
43+
<CopySourceFiles="@(Profiles)"DestinationFolder="$(FSharpSourcesRoot)\..\$(Configuration)\%(RecursiveDir)" />
4344
</Target>
4445

4546
<TargetName="nugetpackfsharpcore"
@@ -50,10 +51,16 @@
5051

5152
<PropertyGroup>
5253
<PackageVersion>X.X.XXX</PackageVersion>
53-
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41Version)</PackageVersion>
54+
55+
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetVersion)</PackageVersion>
5456
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">4.1</PackageMajorVersion>
55-
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">$(FSharpCore42Version)</PackageVersion>
57+
58+
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">$(FSharpCore42TargetVersion)</PackageVersion>
5659
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">4.2</PackageMajorVersion>
60+
61+
<PackageVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41FrozenPortableTargetVersion)</PackageVersion>
62+
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec'">4.1</PackageMajorVersion>
63+
5764
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
5865
</PropertyGroup>
5966

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<packagexmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<!-- rename to FSharp.Core when done-->
5+
<id>Microsoft.Portable.FSharp.Core</id>
6+
<description>Frozen portable profiles</description>
7+
<language>en-US</language>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<version>$version$</version>
10+
<authors>$authors$</authors>
11+
<licenseUrl>$licenseUrl$</licenseUrl>
12+
<projectUrl>$projectUrl$</projectUrl>
13+
<tags>$tags$</tags>
14+
<dependencies></dependencies>
15+
</metadata>
16+
<files>
17+
<filesrc="profiles/net20/**/**"target="lib/" />
18+
<filesrc="profiles/net40/**/**"target="lib/" />
19+
<filesrc="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/**/**"target="lib/" />
20+
<filesrc="profiles/portable-net45+netcore45/**/**"target="lib/" />
21+
<filesrc="profiles/portable-net45+netcore45+wp8/**/**"target="lib/" />
22+
<filesrc="profiles/portable-net45+netcore45+wpa81+wp8/**/**"target="lib/" />
23+
<filesrc="profiles/portable-net45+sl5+netcore45/**/**"target="lib/" />
24+
<filesrc="profiles/xamarinmac20/**/**"target="lib/" />
25+
26+
</files>
27+
</package>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
Outputs='$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'>
277277

278278
<PropertyGroup>
279-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42Version)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
279+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42TargetVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
280280
</PropertyGroup>
281281

282282
<MakeDirDirectories="$(FSharpSourcesRoot)\..\artifacts" />

0 commit comments

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