Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit49375b5

KevinRansom

authored and

brettfo

committed

CP: Use Framework valuetuple rather than netstandard1.0 one (dotnet#5872)

* Use Framework valuetuple rather than netstandard1.0 one (dotnet#5867)* remove references from template

1 parent2bf3a16 commit49375b5Copy full SHA for 49375b5

File tree

8 files changed

-33

lines changed

build.cmd
vsintegration
- ProjectTemplates
  - ConsoleProject/Template
    - ConsoleApplication.fsproj
    - ConsoleApplication.vstemplate
  - LibraryProject/Template
    - Library.fsproj
    - Library.vstemplate
  - TutorialProject/Template
    - Tutorial.fsproj
    - Tutorial.vstemplate
- Vsix/VisualFSharpTemplates
  - VisualFSharpTemplates.csproj

8 files changed

-33

lines changed

`‎build.cmd‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -611,8 +611,8 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se`
`611`	`611`	`:vsversionset`
`612`	`612`	`if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure`
`613`	`613`
`614`		`-ifexist"%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (`
`615`		`-set_msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"`
	`614`	`+ifexist"%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" (`
	`615`	`+set_msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe"`
`616`	`616`	`goto :havemsbuild`
`617`	`617`	`)`
`618`	`618`	`ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (`

`‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,6 @@`
`42`	`42`	`<ReferenceInclude="System"/>`
`43`	`43`	`<ReferenceInclude="System.Core"/>`
`44`	`44`	`<ReferenceInclude="System.Numerics"/>`
`45`		`- <ReferenceInclude="FSharp.Core">`
`46`		`- <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>`
`47`		`- <Private>True</Private>`
`48`		`- </Reference>`
`49`		`- <ReferenceInclude="System.ValueTuple">`
`50`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`51`		`- <Private>True</Private>`
`52`		`- </Reference>`
`53`	`45`	`</ItemGroup>`
`54`	`46`	`<ItemGroup>`
`55`	`47`	`<CompileInclude="AssemblyInfo.fs" />`

`‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`</WizardExtension>`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
`30`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
	`29`	`+ <packageid="System.ValueTuple"version="4.4.0" />`
	`30`	`+ <packageid="FSharp.Core"version="4.5.2" />`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

`‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,6 @@`
`38`	`38`	`<ReferenceInclude="System"/>`
`39`	`39`	`<ReferenceInclude="System.Core"/>`
`40`	`40`	`<ReferenceInclude="System.Numerics"/>`
`41`		`- <ReferenceInclude="FSharp.Core">`
`42`		`- <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>`
`43`		`- <Private>True</Private>`
`44`		`- </Reference>`
`45`		`- <ReferenceInclude="System.ValueTuple">`
`46`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`47`		`- <Private>True</Private>`
`48`		`- </Reference>`
`49`	`41`	`</ItemGroup>`
`50`	`42`	`<ItemGroup>`
`51`	`43`	`<CompileInclude="AssemblyInfo.fs" />`

`‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`</WizardExtension>`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
`30`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
	`29`	`+ <packageid="System.ValueTuple"version="4.4.0" />`
	`30`	`+ <packageid="FSharp.Core"version="4.5.2" />`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

`‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.fsproj‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,6 @@`
`45`	`45`	`<ReferenceInclude="System.Numerics"/>`
`46`	`46`	`<ReferenceInclude="System.Drawing"/>`
`47`	`47`	`<ReferenceInclude="System.Windows.Forms"/>`
`48`		`- <ReferenceInclude="FSharp.Core">`
`49`		`- <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>`
`50`		`- <Private>True</Private>`
`51`		`- </Reference>`
`52`		`- <ReferenceInclude="System.ValueTuple">`
`53`		`- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`54`		`- <Private>True</Private>`
`55`		`- </Reference>`
`56`	`48`	`</ItemGroup>`
`57`	`49`	`<ItemGroup>`
`58`	`50`	`<CompileInclude="Tutorial.fsx" />`

`‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`</WizardExtension>`
`25`	`25`	`<WizardData>`
`26`	`26`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`27`		`- <packageid="System.ValueTuple"version="4.4.0"targetFramework="net40"skipAssemblyReferences="true"/>`
`28`		`- <packageid="FSharp.Core"version="4.5.2"targetFramework="net40"skipAssemblyReferences="true"/>`
	`27`	`+ <packageid="System.ValueTuple"version="4.4.0" />`
	`28`	`+ <packageid="FSharp.Core"version="4.5.2" />`
`29`	`29`	`</packages>`
`30`	`30`	`</WizardData>`
`31`	`31`	`</VSTemplate>`

`‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`<AssemblyName>VisualFSharpTemplate</AssemblyName>`
`7`	`7`	`<OutputType>Library</OutputType>`
`8`	`8`	`<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>`
`9`		`- <DeployExtension>false</DeployExtension>`
	`9`	`+ <DeployExtension>true</DeployExtension>`
`10`	`10`	`</PropertyGroup>`
`11`	`11`
`12`	`12`	`<ItemGroup>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit49375b5

File tree

8 files changed

8 files changed

`‎build.cmd‎`

`‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj‎`

`‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate‎`

`‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj‎`

`‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate‎`

`‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.fsproj‎`

`‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate‎`

`‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎`

0 commit comments