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

Commit1827ae4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into merge-master-into-vs2017-rtm
2 parents4fb59cb +c37ef6e commit1827ae4

File tree

137 files changed

+2810
-1821
lines changed

Some content is hidden

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

137 files changed

+2810
-1821
lines changed

‎setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,17 @@ vs.dependencies
77
vs.dependency id=Microsoft.FSharp.SDK.Core
88
version=$(FSharpPackageVersion)
99
type=Required
10-
10+
1111
vs.dependency id=Microsoft.FSharp.SDK.Resources
1212
version=$(FSharpPackageVersion)
1313
type=Required
14-
14+
1515
vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
1616
version=$(FSharpPackageVersion)
1717
type=Required
1818
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
19-
19+
2020
vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
2121
version=$(FSharpPackageVersion)
2222
type=Required
2323
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
24-
25-
vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Core
26-
version=$(FSharpPackageVersion)
27-
type=Required
28-
when=Microsoft.VisualStudio.Product.DesktopExpress
29-
30-
vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Resources
31-
version=$(FSharpPackageVersion)
32-
type=Required
33-
when=Microsoft.VisualStudio.Product.DesktopExpress
34-
35-
vs.dependency id=Microsoft.FSharp.VSIX.Web.Core
36-
version=$(FSharpPackageVersion)
37-
type=Required
38-
when=Microsoft.VisualStudio.Product.WebExpress
39-
40-
vs.dependency id=Microsoft.FSharp.VSIX.Web.Resources
41-
version=$(FSharpPackageVersion)
42-
type=Required
43-
when=Microsoft.VisualStudio.Product.WebExpress

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr‎

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

3-
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
3+
package name=Microsoft.FSharp.VSIX.Full.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.language=$(LocaleSpecificCulture)
66
vs.package.installSize=1

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

3-
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
3+
package name=Microsoft.FSharp.VSIX.Full.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.language=$(LocaleSpecificCulture)
66

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
1010
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
1111
<OutputPath>$(BinariesFolder)\insertion</OutputPath>
12-
<OutputName>Microsoft.FSharp.VSIX.$(VSSku).Resources.$(LocaleCode)</OutputName>
12+
<OutputName>Microsoft.FSharp.VSIX.Full.Resources.$(LocaleCode)</OutputName>
1313
<IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
1414
<OutputType>vsix</OutputType>
1515
</PropertyGroup>
@@ -19,7 +19,6 @@
1919
<PropertyGroup>
2020
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
22-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSSku=$(VSSku)</PackagePreprocessorDefinitions>
2322
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
2423
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
2524
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
@@ -33,15 +32,14 @@
3332

3433
<ItemGroupCondition="'$(IsLangPack)' == 'true'">
3534
<PackageInclude="Files.swr" />
36-
<PackageInclude="$(VSSku).Templates.swr" />
35+
<PackageInclude="Templates.swr" />
3736
</ItemGroup>
3837

3938
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize">
4039
<!-- SWIX plugin adds the built vsix to signing automatically-->
4140
</Target>
4241

4342
<TargetName="CheckPropertiesArePassed">
44-
<ErrorCondition="'$(VSSku)' == ''"Text="A 'VSSku' property must be passed to the project." />
4543
<ErrorCondition="'$(LocaleCode)' == ''"Text="A 'LocaleCode' property must be passed to the project." />
4644
<ErrorCondition="'$(LocaleId)' == ''"Text="A 'LocaleId' property must be passed to the project." />
4745
<ErrorCondition="'$(LocaleParentCulture)' == ''"Text="A 'LocaleParentCulture' property must be passed to the project." />

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr‎renamed to ‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use vs
22

3-
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
3+
package name=Microsoft.FSharp.VSIX.Full.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.language=$(LocaleSpecificCulture)
66

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎setup/Swix/Microsoft.FSharp.vsmanproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
<ProjectToolsVersion="15.0"DefaultTargets="Build"InitialTargets="IncludeFSharpManifests"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<ImportProject="..\FSharp.Setup.props" />
5-
5+
66
<PropertyGroup>
77
<FSharpSourcesRoot>..\..\src</FSharpSourcesRoot>
88
<FinalizeManifest>true</FinalizeManifest>
99
<FinalizeSkipLayout>true</FinalizeSkipLayout>
1010
<IsPackage>true</IsPackage>
1111
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion</OutputPath>
1212
</PropertyGroup>
13-
13+
1414
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
1515

1616
<TargetName="IncludeFSharpManifests">
1717
<ItemGroup>
1818
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
1919
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />
20-
20+
2121
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json" />
2222
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />
23-
23+
2424
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
2525
</ItemGroup>
2626
</Target>

‎setup/fsharp-setup-build.proj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,7 @@
3838
</CreateItem>
3939

4040
<CreateItemInclude="@(SetupLanguages)"
41-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Desktop">
42-
<OutputItemName="SwixSetupProjects"TaskParameter="Include"/>
43-
</CreateItem>
44-
45-
<CreateItemInclude="@(SetupLanguages)"
46-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Full">
47-
<OutputItemName="SwixSetupProjects"TaskParameter="Include"/>
48-
</CreateItem>
49-
50-
<CreateItemInclude="@(SetupLanguages)"
51-
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Web">
41+
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj">
5242
<OutputItemName="SwixSetupProjects"TaskParameter="Include"/>
5343
</CreateItem>
5444

@@ -68,13 +58,13 @@
6858
<!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages-->
6959
<MSBuildProjects="%(WixSetupProjects.ProjectPath)"
7060
Targets="Clean;Build"
71-
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);VSSku=%(WixSetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/>
61+
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
7262
<MSBuildProjects="%(VsixProjects.ProjectPath)"
7363
Targets="Build"
7464
Properties="IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(InsertionDir)"/>
7565
<MSBuildProjects="%(SwixSetupProjects.ProjectPath)"
7666
Targets="Build"
77-
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);VSSku=%(SwixSetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/>
67+
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
7868

7969
<!-- copy json stuff-->
8070
<CopySourceFiles="@(InsertionItems)"DestinationFolder="$(InsertionDir)" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<PropertyGroup>
110110
<BuildRevision>$([System.DateTime]::Now.ToString(`yyMMdd`))</BuildRevision>
111111
<NuGetReleaseVersion>1.0.0</NuGetReleaseVersion>
112-
<NuGetPreReleaseVersion>$(NuGetReleaseVersion)-alpha</NuGetPreReleaseVersion>
112+
<NuGetPreReleaseVersion>$(NuGetReleaseVersion)-rc</NuGetPreReleaseVersion>
113113
<NuGetPerBuildPreReleaseVersionCondition="'$(BuildRevision)' != ''">$(NuGetPreReleaseVersion)-$(BuildRevision.Trim())</NuGetPerBuildPreReleaseVersion>
114114
</PropertyGroup>
115115

0 commit comments

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