提交 83872de0 编写于 作者: K Kevin Ransom (msft) 提交者: GitHub

Update to System.ValueTuple 4.3.1 (#3136)

* Update to System.ValueTuple 4.3.1

* a couple more
上级 0c95431c
......@@ -604,7 +604,7 @@
<HintPath>$(FSharpSourcesRoot)\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>$(FSharpSourcesRoot)\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>true</Private>
</Reference>
</ItemGroup>
......
......@@ -16,7 +16,7 @@
<package id="System.Reflection.Metadata" version="1.4.2" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<package id="Microsoft.DiaSymReader" version="1.1.0" />
<package id="System.ValueTuple" version="4.3.0" />
<package id="System.ValueTuple" version="4.3.1" />
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
<!-- Testing -->
......
......@@ -187,7 +187,7 @@
</Component>
<Component Id="Compiler_Redist_System.ValueTuple.dll" Guid="$(fsharp.guid(Compiler_Redist_System.ValueTuple.dll, $(var.LocaleCode)))">
<File Id="Compiler_Redist_System.ValueTuple.dll" Source="$(var.NugetPackagesDir)\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll" />
<File Id="Compiler_Redist_System.ValueTuple.dll" Source="$(var.NugetPackagesDir)\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll" />
</Component>
</DirectoryRef>
......
......@@ -12,6 +12,6 @@
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
<package id="System.ValueTuple" version="4.3.0" />
<package id="System.ValueTuple" version="4.3.1" />
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
</packages>
......@@ -659,7 +659,7 @@
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>true</Private>
</Reference>
</ItemGroup>
......
......@@ -33,7 +33,7 @@
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<dependency id="Microsoft.DiaSymReader" version="1.1.0" />
<dependency id="System.ValueTuple" version="4.3.0" />
<dependency id="System.ValueTuple" version="4.3.1" />
</group>
</dependencies>
</metadata>
......
......@@ -19,7 +19,7 @@
"System.Threading.ThreadPool": "4.3.0",
"Microsoft.DiaSymReader.PortablePdb": "1.1.0",
"Microsoft.DiaSymReader": "1.1.0",
"System.ValueTuple": "4.3.0"
"System.ValueTuple": "4.3.1"
},
"runtimes": {
"win7-x86": { },
......
......@@ -48,7 +48,7 @@
<Reference Include="System.Numerics" Condition="'$(TargetFramework)' == 'net40'" />
<Reference Include="System.Core" />
<Reference Include="System.ValueTuple">
<HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
......
......@@ -32,7 +32,7 @@
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1" />
<dependency id="System.Threading.Thread" version="4.0.0" />
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
<dependency id="System.ValueTuple" version="4.3.0" />
<dependency id="System.ValueTuple" version="4.3.1" />
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<dependency id="Microsoft.DiaSymReader" version="1.0.8" />
</group>
......
......@@ -31,7 +31,7 @@
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1" />
<dependency id="System.Threading.Thread" version="4.0.0" />
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
<dependency id="System.ValueTuple" version="4.3.0" />
<dependency id="System.ValueTuple" version="4.3.1" />
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<dependency id="Microsoft.DiaSymReader" version="1.0.8" />
</group>
......
......@@ -59,8 +59,8 @@
<Name>FSharp.Core</Name>
</ProjectReference>
<Reference Include="System.ValueTuple">
<HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath Condition="'$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath Condition="'$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -25,7 +25,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System.ValueTuple">
<HintPath>..\..\..\..\..\packages\System.ValueTuple.4.3.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<HintPath>..\..\..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
......
......@@ -9,7 +9,7 @@
"nunit": "3.5.0",
"nunitlite": "3.5.0",
"FSharp.Core.netcore": "1.0.0-rc-*",
"System.ValueTuple": "4.3.0",
"System.ValueTuple": "4.3.1",
"FsCheck": "2.6.2",
"Microsoft.FSharp.TupleSample": "1.0.0-alpha-161112"
},
......
......@@ -469,7 +469,7 @@
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'coreclr' AND '$(MonoPackaging)' != 'true' ">
......
......@@ -70,7 +70,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net452" />
</packages>
\ No newline at end of file
......@@ -68,7 +68,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net452" />
</packages>
\ No newline at end of file
......@@ -45,7 +45,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
......
......@@ -64,7 +64,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net452" />
</packages>
\ No newline at end of file
......@@ -65,7 +65,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net452" />
</packages>
\ No newline at end of file
......@@ -45,7 +45,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
......
......@@ -48,7 +48,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System"/>
......
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -44,7 +44,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System"/>
......
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -41,7 +41,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -41,7 +41,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -41,7 +41,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -40,7 +40,7 @@
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -58,7 +58,7 @@
<Reference Include="System.Drawing"/>
<Reference Include="System.Windows.Forms"/>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
......
......@@ -24,7 +24,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.3.0" targetFramework="net40" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.3.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net462" />
</packages>
\ No newline at end of file
......@@ -85,9 +85,9 @@
<Link>License.txt</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\System.ValueTuple.4.3.0.nupkg">
<Content Include="$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\System.ValueTuple.4.3.1.nupkg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>packages\System.ValueTuple.4.3.0.nupkg</Link>
<Link>packages\System.ValueTuple.4.3.1.nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
......
......@@ -84,9 +84,9 @@
<Link>License.txt</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\System.ValueTuple.4.3.0.nupkg">
<Content Include="$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\System.ValueTuple.4.3.1.nupkg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>packages\System.ValueTuple.4.3.0.nupkg</Link>
<Link>packages\System.ValueTuple.4.3.1.nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册