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

Commite03bc82

Browse files
authored
Versioning Redux (dotnet#4112)
* Versioning Redux* Supported runtimes* No this is better* Refactor targets slightly and parameterize VS version throughout* Update fcs tests for new portable version* Property pages versioning, additional text* Fix VS tests
1 parent724bd66 commite03bc82

File tree

61 files changed

+218
-172
lines changed

Some content is hidden

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

61 files changed

+218
-172
lines changed

‎fcs/.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FSharp.Compiler.Service.netstandard/illex.fs
2+
FSharp.Compiler.Service.netstandard/ilpars.fs
3+
FSharp.Compiler.Service.netstandard/ilpars.fsi
4+
FSharp.Compiler.Service.netstandard/lex.fs
5+
FSharp.Compiler.Service.netstandard/pars.fs
6+
FSharp.Compiler.Service.netstandard/pars.fsi
7+
FSharp.Compiler.Service.netstandard/pplex.fs
8+
FSharp.Compiler.Service.netstandard/pppars.fs
9+
FSharp.Compiler.Service.netstandard/pppars.fsi
10+

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<packageid="FSharp.Compiler.Tools"version="4.1.27"/>
4646

4747
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
48-
<packageid="Microsoft.Portable.FSharp.Core"version="4.3.0"/>
48+
<packageid="Microsoft.Portable.FSharp.Core"version="10.1.0"/>
4949

5050
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
5151
<packageid="FSharp.Core"version="4.1.17"/>

‎setup/FSharp.SDK/Common.Wix.Properties.wxs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181

8282
<DirectoryId="MicrosoftSDKs"Name="Microsoft SDKs">
8383
<DirectoryId="MicrosoftSDKs_FS"Name="F#">
84-
<DirectoryId="MicrosoftSDKs_FS_4.3"Name="4.3">
85-
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework"Name="Framework">
86-
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework_v4.0"Name="v4.0">
87-
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
84+
<DirectoryId="MicrosoftSDKs_FS_10.1"Name="10.1">
85+
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework"Name="Framework">
86+
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework_v4.0"Name="v4.0">
87+
<DirectoryId="MicrosoftSDKs_FS_10.1_Framework_v4.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
8888
</Directory>
8989
</Directory>
9090
</Directory>

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<Wixxmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<?define ProductVersion ="4.3"?>
5+
<?define ProductVersion ="10.1"?>
66
<?define ProductPlatform ="x86"?>
77
<?define ProductManufacturer ="Microsoft Corporation"?>
88
<?define ProductDescription ="Visual F# $(var.ProductVersion) SDK"?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
1010
</ComponentGroup>
1111

12-
<DirectoryRefId="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)">
12+
<DirectoryRefId="MicrosoftSDKs_FS_10.1_Framework_v4.0_$(var.LocaleId)">
1313
<ComponentId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
1414
<FileId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
1515
</Component>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
</ComponentGroup>
4141

42-
<DirectoryRefId="MicrosoftSDKs_FS_4.3_Framework_v4.0">
42+
<DirectoryRefId="MicrosoftSDKs_FS_10.1_Framework_v4.0">
4343

4444
<ComponentId="Compiler_Redist_FSharp.Core.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Core.dll, $(var.LocaleCode)))">
4545
<FileId="Compiler_Redist_FSharp.Core.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll"KeyPath="yes">
@@ -131,18 +131,18 @@
131131
</Component>
132132

133133
<ComponentId="Compiler_Redist_RegistryKeys_CompilerLocation"Guid="$(fsharp.guid(Compiler_Redist_RegistryKeys_CompilerLocation, $(var.LocaleCode)))">
134-
<EnvironmentId="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable"Name="FSHARPINSTALLDIR"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]"Action="create"System="yes" />
135-
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\FSharp\4.3\Runtime\v4.0"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
136-
<RegistryValueValue="[MicrosoftSDKs_FS_4.3_Framework_v4.0]"Type="string" />
134+
<EnvironmentId="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable"Name="FSHARPINSTALLDIR"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]"Action="create"System="yes" />
135+
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\FSharp\10.1\Runtime\v4.0"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
136+
<RegistryValueValue="[MicrosoftSDKs_FS_10.1_Framework_v4.0]"Type="string" />
137137
</RegistryKey>
138138
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\VisualStudio\15.0\MSBuild\SafeImports"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
139-
<RegistryValueName="Microsoft.FSharp.Targets"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.Targets"Type="string" />
140-
<RegistryValueName="Microsoft.Portable.FSharp.Targets"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.Portable.FSharp.Targets"Type="string" />
141-
<RegistryValueName="Microsoft.FSharp.NetSdk.props"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.NetSdk.props"Type="string" />
142-
<RegistryValueName="Microsoft.FSharp.NetSdk.targets"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharpNetSdk.targets"Type="string" />
139+
<RegistryValueName="Microsoft.FSharp.Targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharp.Targets"Type="string" />
140+
<RegistryValueName="Microsoft.Portable.FSharp.Targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.Portable.FSharp.Targets"Type="string" />
141+
<RegistryValueName="Microsoft.FSharp.NetSdk.props"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharp.NetSdk.props"Type="string" />
142+
<RegistryValueName="Microsoft.FSharp.NetSdk.targets"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharpNetSdk.targets"Type="string" />
143143
</RegistryKey>
144144
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\VisualStudio\15.0\Setup\F#"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
145-
<RegistryValueName="ProductDir"Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]"Type="string" />
145+
<RegistryValueName="ProductDir"Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]"Type="string" />
146146
</RegistryKey>
147147
</Component>
148148

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@
5151

5252
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0_$(var.LocaleId)">
5353
<ComponentId="Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
54-
<FileId="Runtime_LangPack_4.4.3.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
54+
<FileId="Runtime_LangPack_4.4.3.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
5555
</Component>
5656
</DirectoryRef>
5757

5858
<!-- F# 4.1-->
5959

6060
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)">
6161
<ComponentId="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
62-
<FileId="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
62+
<FileId="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
6363
</Component>
6464
</DirectoryRef>
6565
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">
@@ -167,7 +167,7 @@
167167

168168
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp">
169169
<ComponentId="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode), $(var.LocaleCode)))">
170-
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\FSharp\4.3\Runtime\v4.0_$(var.LocaleId)\Install"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
170+
<RegistryKeyRoot="HKLM"Key="Software\Microsoft\FSharp\10.1\Runtime\v4.0_$(var.LocaleId)\Install"ForceCreateOnInstall="yes"ForceDeleteOnUninstall="yes">
171171
<RegistryValueName="InstallSuccess"Value="4.4.3.0"Type="string" />
172172
</RegistryKey>
173173
</Component>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0">
4040
<ComponentId="Runtime_Redist_4.4.3.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_4.4.3.0_FSharp.Core, $(var.LocaleCode)))">
4141
<FileId="Runtime_Redist_4.4.3.0_FSharp.Core.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll"KeyPath="yes" />
42+
<FileId="Runtime_Redist_4.4.3.0_FSharp.Core.xml"Source="$(var.BinariesDir)\net40\bin\FSharp.Core.xml" />
4243
<!-- NOTE: The optdata and sigdata files are now integrated as resources for more recent FSharp.Core.dll's.-->
4344
<!-- However old versions of FSharp.Core still need these files. For consistency we also continue to produce the files-->
4445
<!-- for FSharp.Core 4.4.1.0, and include them in the redist.-->

‎setup/FSharp.Setup.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
14-
<FSharpProductVersion>4.3</FSharpProductVersion>
14+
<FSharpProductVersion>10.1</FSharpProductVersion>
1515
<!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build-->
1616
<BUILD_BUILDNUMBERCondition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
1717
<!-- Remove .DRAFT suffix if it exists in the build number-->

‎setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use vs
33
package name=Microsoft.FSharp.SDK.Core
44
version=$(FSharpPackageVersion)
55
vs.package.type=msi
6-
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.3
6+
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.1
77

88
vs.installSize
99
SystemDrive=194670592

0 commit comments

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