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

Commit70202a1

Browse files
author
dotnet-automerge-bot
authored
Merge pull requestdotnet#5877 from Microsoft/merges/dev16.0-preview1-to-dev16.0
Merge dev16.0-preview1 to dev16.0
2 parentsf332ad0 +622b9b8 commit70202a1

File tree

8 files changed

+9
-33
lines changed

8 files changed

+9
-33
lines changed

‎build.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,8 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se
611611
:vsversionset
612612
if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure
613613

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"
616616
goto :havemsbuild
617617
)
618618
ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@
4242
<ReferenceInclude="System"/>
4343
<ReferenceInclude="System.Core"/>
4444
<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\net461\System.ValueTuple.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
5345
</ItemGroup>
5446
<ItemGroup>
5547
<CompileInclude="AssemblyInfo.fs" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</WizardExtension>
2727
<WizardData>
2828
<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" />
3131
</packages>
3232
</WizardData>
3333
</VSTemplate>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@
3838
<ReferenceInclude="System"/>
3939
<ReferenceInclude="System.Core"/>
4040
<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\net461\System.ValueTuple.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
4941
</ItemGroup>
5042
<ItemGroup>
5143
<CompileInclude="AssemblyInfo.fs" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</WizardExtension>
2727
<WizardData>
2828
<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" />
3131
</packages>
3232
</WizardData>
3333
</VSTemplate>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@
4545
<ReferenceInclude="System.Numerics"/>
4646
<ReferenceInclude="System.Drawing"/>
4747
<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\net461\System.ValueTuple.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
5648
</ItemGroup>
5749
<ItemGroup>
5850
<CompileInclude="Tutorial.fsx" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</WizardExtension>
2525
<WizardData>
2626
<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" />
2929
</packages>
3030
</WizardData>
3131
</VSTemplate>

‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>VisualFSharpTemplate</AssemblyName>
77
<OutputType>Library</OutputType>
88
<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
9-
<DeployExtension>false</DeployExtension>
9+
<DeployExtension>true</DeployExtension>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

0 commit comments

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