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

Commit48f3fd6

Browse files
committed
Fix version numbers for FSharp OSS build
Upgrade toolset to 14 and minimumvsversion to 14 to eliminate project upgrade.update oss version number for vs components to 14.0.0.9055 (changeset 1376881)
1 parentebaaa33 commit48f3fd6

File tree

40 files changed

+61
-58
lines changed

40 files changed

+61
-58
lines changed

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</When>
2525
<WhenCondition="'$(AssemblyName)' == 'FSharp.LanguageService' or '$(AssemblyName)' == 'FSharp.LanguageService.Compiler' or '$(AssemblyName)' == 'FSharp.LanguageService.Base' or '$(AssemblyName)' == 'FSharp.Editor' or '$(AssemblyName)' == 'FSharp.VS.FSI' or '$(AssemblyName)' == 'FSharp.ProjectSystem.FSharp'">
2626
<PropertyGroup>
27-
<OtherFlags>$(OtherFlags) --version:12.0.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
27+
<OtherFlags>$(OtherFlags) --version:14.0.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
2828
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
2929
<StrongNames>true</StrongNames>
3030
</PropertyGroup>

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
66
<vsFrameworkLatest>Microsoft.VisualStudio.Shell.12.0</vsFrameworkLatest>

‎vsintegration/src/Templates/ConsoleProjectTemplates/ConsoleProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/ItemTemplates/ItemTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/LibraryProjectTemplates/LibraryProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/NetCore259ProjectTemplates/NetCore259ProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/NetCore78ProjectTemplates/NetCore78ProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/PortableLibraryProjectTemplates/PortableLibraryProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

‎vsintegration/src/Templates/ProjectTemplates/ProjectTemplates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
77
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

0 commit comments

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