提交 ff66952e 编写于 作者: T Tomas Matousek

Updates CoreFX dependencies to rc3-24126-00

上级 b01c8390
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
"Microsoft.Build": "0.1.0-preview-00017", "Microsoft.Build": "0.1.0-preview-00017",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160202-02", "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160202-02",
"Microsoft.Net.Compilers.Targets.netcore": "0.1.4-dev", "Microsoft.Net.Compilers.Targets.netcore": "0.1.4-dev",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23811", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", "Microsoft.NETCore.TestHost": "1.0.0-rc3-24126-00",
"NETStandard.Library": "1.0.0-rc2-23811", "NETStandard.Library": "1.0.0-rc3-24126-00",
"MSBuild": "0.1.0-preview-00017", "MSBuild": "0.1.0-preview-00017",
"System.Security.Cryptography.X509Certificates": "4.0.0-rc2-23811", "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-24126-00",
"System.Diagnostics.Process": "4.1.0-rc2-23811", "System.Diagnostics.Process": "4.1.0-rc3-24126-00",
"Newtonsoft.Json": "7.0.1" "Newtonsoft.Json": "7.0.1"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
}, },
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
'$(TargetFrameworkVersion)' == 'v5.0'"> '$(TargetFrameworkVersion)' == 'v5.0'">
<!-- Treat portable exes as CoreClr-targeting-exes --> <!-- Treat portable exes as CoreClr-targeting-exes -->
<PropertyGroup Condition="'$(OutputType)' == 'Exe'"> <PropertyGroup Condition="'$(OutputType)' == 'Exe'">
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker> <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier> <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
......
...@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then ...@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then
fi fi
# Replace with a robust method for finding the right crossgen.exe # Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc2-23931/tools/crossgen CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc3-24126-00/tools/crossgen
cd $BIN_DIR cd $BIN_DIR
......
{ {
"dependencies": { }, "dependencies": { },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"Microsoft.NETCore.Platforms": "1.0.0", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00",
"Microsoft.Build.Framework": "0.1.0-preview-00005",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00005", "Microsoft.Build.Tasks.Core": "0.1.0-preview-00005",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00005", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
"Microsoft.Win32.Primitives": "4.0.0", "Microsoft.Win32.Primitives": "4.0.0",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc3-24126-00",
"System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tools": "4.0.0",
"System.Diagnostics.Process": "4.1.0-rc2-23931", "System.Diagnostics.Process": "4.1.0-rc3-24126-00",
"System.IO.Pipes": "4.0.0-rc2-23931", "System.IO.Pipes": "4.0.0-rc3-24126-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24126-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23931" "System.IO.FileSystem": "4.0.1-rc3-24126-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
{ {
"dependencies": { }, "dependencies": { },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
}, },
......
{ {
"dependencies": { }, "dependencies": { },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
}, },
......
...@@ -13,22 +13,22 @@ ...@@ -13,22 +13,22 @@
<dependency id="System.Collections.Immutable" version="1.1.37" /> <dependency id="System.Collections.Immutable" version="1.1.37" />
</group> </group>
<group targetFramework="netstandard1.1"> <group targetFramework="netstandard1.1">
<dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60429-01" /> <dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60526-03" />
<dependency id="System.Collections" version="4.0.11-rc2-24027" /> <dependency id="System.Collections" version="4.0.11-rc3-24126-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24027" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24126-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24126-00" />
<dependency id="System.Globalization" version="4.0.0-rc2-24027" /> <dependency id="System.Globalization" version="4.0.0-rc3-24126-00" />
<dependency id="System.IO" version="4.1.0-rc2-24027" /> <dependency id="System.IO" version="4.1.0-rc3-24126-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24027" /> <dependency id="System.Linq" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24027" /> <dependency id="System.Reflection" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc2-24027" /> <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24126-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24126-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24027" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24027" /> <dependency id="System.Threading" version="4.0.11-rc3-24126-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24027" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24126-00" />
</group> </group>
</dependencies> </dependencies>
<language>en-US</language> <language>en-US</language>
......
{ {
"dependencies": { }, "dependencies": { },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": ["portable-net452", "dotnet"]
} }
}, },
"runtimes": { "runtimes": {
......
{ {
"dependencies": { }, "dependencies": { },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": ["portable-net452", "dotnet"]
} }
}, },
"runtimes": { "runtimes": {
......
...@@ -21,44 +21,44 @@ Supported Platforms: ...@@ -21,44 +21,44 @@ Supported Platforms:
<group targetFramework="netstandard1.3"> <group targetFramework="netstandard1.3">
<dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" /> <dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" />
<dependency id="System.AppContext" version="4.1.0-rc2-24027" /> <dependency id="System.AppContext" version="4.1.0-rc3-24126-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24027" /> <dependency id="System.Collections" version="4.0.11-rc3-24126-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc2-24027" /> <dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24126-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24027" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24126-00" />
<dependency id="System.Console" version="4.0.0-rc2-24027" /> <dependency id="System.Console" version="4.0.0-rc3-24126-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24126-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-24027" exclude="Compile" /> <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24126-00" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24027" exclude="Compile" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24126-00" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24027" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24126-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" /> <dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24126-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24027" /> <dependency id="System.Globalization" version="4.0.11-rc3-24126-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24027" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24126-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-24027" /> <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24126-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24027" /> <dependency id="System.Linq" version="4.1.0-rc3-24126-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" /> <dependency id="System.Linq.Expressions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24027" /> <dependency id="System.Reflection" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc2-24027" /> <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24126-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24126-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc2-24027" /> <dependency id="System.Runtime.Handles" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc2-24027" /> <dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24126-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-24027" /> <dependency id="System.Security.Cryptography.Algorithms" version="4.2.0-rc3-24126-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-24027" /> <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24126-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-24027" /> <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24126-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24027" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24126-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-24027" exclude="Compile" /> <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24126-00" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24027" /> <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24027" exclude="Compile" /> <dependency id="System.Threading" version="4.0.11-rc3-24126-00" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24027" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-24027" /> <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24126-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc2-24027" exclude="Compile" /> <dependency id="System.Threading.Thread" version="4.0.0-rc3-24126-00" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-24027" /> <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24126-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24027" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24126-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-24027" exclude="Compile" /> <dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24126-00" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-24027" exclude="Compile" /> <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24126-00" exclude="Compile" />
</group> </group>
</dependencies> </dependencies>
......
...@@ -18,25 +18,25 @@ ...@@ -18,25 +18,25 @@
<dependencies> <dependencies>
<dependency id="Microsoft.CodeAnalysis.Common" version="[$version$]" /> <dependency id="Microsoft.CodeAnalysis.Common" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc2-24027" /> <dependency id="System.AppContext" version="4.1.0-rc3-24126-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24027" /> <dependency id="System.Collections" version="4.0.11-rc3-24126-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24027" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24126-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24126-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24027" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24126-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24027" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24126-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24027" /> <dependency id="System.Globalization" version="4.0.11-rc3-24126-00" />
<dependency id="System.IO" version="4.1.0-rc2-24027" /> <dependency id="System.IO" version="4.1.0-rc3-24126-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24027" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24126-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24027" /> <dependency id="System.Linq" version="4.1.0-rc3-24126-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" /> <dependency id="System.Linq.Expressions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24027" /> <dependency id="System.Reflection" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" /> <dependency id="System.Reflection.Extensions" version="4.0.1-rc3-24126-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24126-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24027" /> <dependency id="System.Threading" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24027" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24126-00" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
CoreCLR-compatible version of csi.exe. CoreCLR-compatible version of csi.exe.
Supported Platforms: Supported Platforms:
- .NET Core (dnxcore50) - .NET Core (NETCoreApp1.0)
</description> </description>
<language>en-US</language> <language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <requireLicenseAcceptance>true</requireLicenseAcceptance>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<projectUrl>$projectUrl$</projectUrl> <projectUrl>$projectUrl$</projectUrl>
<tags>$tags$</tags> <tags>$tags$</tags>
<dependencies> <dependencies>
<group targetFramework="dnxcore50"> <group targetFramework="NETCoreApp1.0">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" /> <dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" /> <dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" />
<dependency id="NETStandard.Library" version="1.5.0-rc2-24027" /> <dependency id="NETStandard.Library" version="1.5.0-rc3-24126-00" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
CoreCLR-compatible versions of the C# and VB compilers. CoreCLR-compatible versions of the C# and VB compilers.
Supported Platforms: Supported Platforms:
- .NET Core (dnxcore50) - .NET Core (NETCoreApp1.0)
</description> </description>
<language>en-US</language> <language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <requireLicenseAcceptance>true</requireLicenseAcceptance>
...@@ -16,52 +16,52 @@ ...@@ -16,52 +16,52 @@
<projectUrl>$projectUrl$</projectUrl> <projectUrl>$projectUrl$</projectUrl>
<tags>$tags$</tags> <tags>$tags$</tags>
<dependencies> <dependencies>
<group targetFramework="dnxcore50"> <group targetFramework="NETCoreApp1.0">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" /> <dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc2-24027" /> <dependency id="System.AppContext" version="4.1.0-rc3-24126-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24027" /> <dependency id="System.Collections" version="4.0.11-rc3-24126-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc2-24027" /> <dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24126-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24027" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24126-00" />
<dependency id="System.Console" version="4.0.0-rc2-24027" /> <dependency id="System.Console" version="4.0.0-rc3-24126-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24126-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-24027" /> <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24126-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24027" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24126-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24027" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24126-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" /> <dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24126-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24027" /> <dependency id="System.Globalization" version="4.0.11-rc3-24126-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24027" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24126-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-24027" /> <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24126-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24027" /> <dependency id="System.Linq" version="4.1.0-rc3-24126-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" /> <dependency id="System.Linq.Expressions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24027" /> <dependency id="System.Reflection" version="4.1.0-rc3-24126-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24126-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc2-24027" /> <dependency id="System.Runtime.Handles" version="4.0.1-rc3-24126-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24126-00" />
<dependency id="System.Runtime.Loader" version="4.0.0-rc2-24027" /> <dependency id="System.Runtime.Loader" version="4.0.0-rc3-24126-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc2-24027" /> <dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24126-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-24027" /> <dependency id="System.Security.Cryptography.Algorithms" version="4.2.0-rc3-24126-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-24027" /> <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24126-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-24027" /> <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24126-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24027" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24126-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-24027" /> <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24126-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24027" /> <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24027" /> <dependency id="System.Threading" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24027" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24126-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-24027" /> <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24126-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc2-24027" /> <dependency id="System.Threading.Thread" version="4.0.0-rc3-24126-00" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-24027" /> <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24126-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24027" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24126-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-24027" /> <dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24126-00" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-24027" /> <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24126-00" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<file src="$emptyDirPath$/_._" target="ref/dotnet" /> <file src="$emptyDirPath$/_._" target="ref/dotnet" />
<file src="$emptyDirPath$/_._" target="ref/dnxcore50" /> <file src="$emptyDirPath$/_._" target="ref/netcoreapp1.0" />
<file src="csccore/csc.exe" target="runtimes/any/native" /> <file src="csccore/csc.exe" target="runtimes/any/native" />
<file src="vbccore/vbc.exe" target="runtimes/any/native" /> <file src="vbccore/vbc.exe" target="runtimes/any/native" />
</files> </files>
......
...@@ -46,10 +46,6 @@ ...@@ -46,10 +46,6 @@
<Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project> <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
<Name>Microsoft.CodeAnalysis.Workspaces</Name> <Name>Microsoft.CodeAnalysis.Workspaces</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\src\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
<Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\src\Workspaces\CSharp\Portable\CSharpWorkspace.csproj"> <ProjectReference Include="..\..\..\..\..\..\src\Workspaces\CSharp\Portable\CSharpWorkspace.csproj">
<Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project> <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
<Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name> <Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name>
......
...@@ -83,10 +83,6 @@ ...@@ -83,10 +83,6 @@
<Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project> <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
<Name>Microsoft.CodeAnalysis.Workspaces</Name> <Name>Microsoft.CodeAnalysis.Workspaces</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\src\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
<Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\src\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj"> <ProjectReference Include="..\..\..\..\..\..\src\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}</Project> <Project>{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}</Project>
<Name>Microsoft.CodeAnalysis.VisualBasic.Workspaces</Name> <Name>Microsoft.CodeAnalysis.VisualBasic.Workspaces</Name>
......
{ {
"dependencies": { "dependencies": {
"System.Diagnostics.Process": "4.1.0-rc2-23931" "System.Diagnostics.Process": "4.1.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 --> <!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc2-24027\ref\netstandard1.5\System.Runtime.Loader.dll"> <Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc3-24126-00\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"xunit.console.netcore": "1.0.2-prerelease-00104" "xunit.console.netcore": "1.0.2-prerelease-00104"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": [ "portable-net452", "dotnet" ]
} }
}, },
"runtimes": { "runtimes": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0", "Microsoft.CSharp": "4.0.0",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections.Concurrent": "4.0.10", "System.Collections.Concurrent": "4.0.10",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc3-24126-00",
"System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Debug": "4.0.10",
"System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tools": "4.0.0",
"System.IO.FileSystem": "4.0.0", "System.IO.FileSystem": "4.0.0",
"System.Reflection.TypeExtensions": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0",
"System.Threading.Thread": "4.0.0-rc2-23931", "System.Threading.Thread": "4.0.0-rc3-24126-00",
"System.Xml.XDocument": "4.0.10", "System.Xml.XDocument": "4.0.10",
"System.Xml.XmlDocument": "4.0.0", "System.Xml.XmlDocument": "4.0.0"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
<!-- Override the defaults and make this dnxcore50 --> <!-- Override the defaults and make this .NETCoreApp -->
<PropertyGroup> <PropertyGroup>
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker> <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24126-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23931", "Microsoft.NETCore.TestHost": "1.0.0-rc3-24126-00",
"System.Runtime": "4.0.20" "System.Runtime": "4.1.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
} }
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
<!-- Override the defaults and make this dnxcore50 --> <!-- Override the defaults and make this .NETCoreApp -->
<PropertyGroup> <PropertyGroup>
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker> <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-24027", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24126-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027", "Microsoft.NETCore.TestHost": "1.0.0-rc3-24126-00",
"System.AppContext": "4.1.0-rc2-24027", "System.AppContext": "4.1.0-rc3-24126-00",
"System.Collections": "4.0.11-rc2-24027", "System.Collections": "4.0.11-rc3-24126-00",
"System.Collections.Concurrent": "4.0.12-rc2-24027", "System.Collections.Concurrent": "4.0.12-rc3-24126-00",
"System.Collections.Immutable": "1.2.0-rc2-24027", "System.Collections.Immutable": "1.2.0-rc3-24126-00",
"System.Console": "4.0.0-rc2-24027", "System.Console": "4.0.0-rc3-24126-00",
"System.Diagnostics.Debug": "4.0.11-rc2-24027", "System.Diagnostics.Debug": "4.0.11-rc3-24126-00",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24126-00",
"System.Diagnostics.Process": "4.1.0-rc2-24027", "System.Diagnostics.Process": "4.1.0-rc3-24126-00",
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027", "System.Diagnostics.StackTrace": "4.0.1-rc3-24126-00",
"System.Diagnostics.Tools": "4.0.1-rc2-24027", "System.Diagnostics.Tools": "4.0.1-rc3-24126-00",
"System.Dynamic.Runtime": "4.0.11-rc2-24027", "System.Dynamic.Runtime": "4.0.11-rc3-24126-00",
"System.Globalization": "4.0.11-rc2-24027", "System.Globalization": "4.0.11-rc3-24126-00",
"System.IO.FileSystem": "4.0.1-rc2-24027", "System.IO.FileSystem": "4.0.1-rc3-24126-00",
"System.IO.FileSystem.Primitives": "4.0.1-rc2-24027", "System.IO.FileSystem.Primitives": "4.0.1-rc3-24126-00",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24027", "System.IO.FileSystem.Watcher": "4.0.0-rc3-24126-00",
"System.IO.Pipes": "4.0.0-rc2-24027", "System.IO.Pipes": "4.0.0-rc3-24126-00",
"System.Linq": "4.1.0-rc2-24027", "System.Linq": "4.1.0-rc3-24126-00",
"System.Linq.Expressions": "4.0.11-rc2-24027", "System.Linq.Expressions": "4.1.0-rc3-24126-00",
"System.Net.NameResolution": "4.0.0-rc2-24027", "System.Net.NameResolution": "4.0.0-rc3-24126-00",
"System.Net.Sockets": "4.1.0-rc2-24027", "System.Net.Sockets": "4.1.0-rc3-24126-00",
"System.Reflection": "4.1.0-rc2-24027", "System.Reflection": "4.1.0-rc3-24126-00",
"System.Reflection.Primitives": "4.0.1-rc2-24027", "System.Reflection.Primitives": "4.0.1-rc3-24126-00",
"System.Resources.ResourceManager": "4.0.1-rc2-24027", "System.Resources.ResourceManager": "4.0.1-rc3-24126-00",
"System.Runtime": "4.1.0-rc2-24027", "System.Runtime": "4.1.0-rc3-24126-00",
"System.Runtime.Extensions": "4.1.0-rc2-24027", "System.Runtime.Extensions": "4.1.0-rc3-24126-00",
"System.Runtime.Handles": "4.0.1-rc2-24027", "System.Runtime.Handles": "4.0.1-rc3-24126-00",
"System.Runtime.InteropServices": "4.1.0-rc2-24027", "System.Runtime.InteropServices": "4.1.0-rc3-24126-00",
"System.Runtime.Loader": "4.0.0-rc2-24027", "System.Runtime.Loader": "4.0.0-rc3-24126-00",
"System.Runtime.Numerics": "4.0.1-rc2-24027", "System.Runtime.Numerics": "4.0.1-rc3-24126-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027", "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24126-00",
"System.Security.Cryptography.Encoding": "4.0.0-rc2-24027", "System.Security.Cryptography.Encoding": "4.0.0-rc3-24126-00",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027", "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24126-00",
"System.Text.Encoding": "4.0.11-rc2-24027", "System.Text.Encoding": "4.0.11-rc3-24126-00",
"System.Text.Encoding.CodePages": "4.0.1-rc2-24027", "System.Text.Encoding.CodePages": "4.0.1-rc3-24126-00",
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027", "System.Text.Encoding.Extensions": "4.0.11-rc3-24126-00",
"System.Threading": "4.0.11-rc2-24027", "System.Threading": "4.0.11-rc3-24126-00",
"System.Threading.Tasks": "4.0.11-rc2-24027", "System.Threading.Tasks": "4.0.11-rc3-24126-00",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027", "System.Threading.Tasks.Parallel": "4.0.1-rc3-24126-00",
"System.Threading.Thread": "4.0.0-rc2-24027", "System.Threading.Thread": "4.0.0-rc3-24126-00",
"System.Xml.ReaderWriter": "4.0.11-rc2-24027", "System.Xml.ReaderWriter": "4.0.11-rc3-24126-00",
"System.Xml.XDocument": "4.0.11-rc2-24027", "System.Xml.XDocument": "4.0.11-rc3-24126-00",
"System.Xml.XmlDocument": "4.0.1-rc2-24027", "System.Xml.XmlDocument": "4.0.1-rc3-24126-00",
"System.Xml.XPath.XDocument": "4.0.1-rc2-24027" "System.Xml.XPath.XDocument": "4.0.1-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netcoreapp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
} }
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24126-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23931" "Microsoft.NETCore.TestHost": "1.0.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "NETCoreApp1.0": {
"imports": "portable-net452" "imports": "portable-net452"
} }
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"NETStandard.Library": "1.5.0-rc2-23931", "NETStandard.Library": "1.5.0-rc3-24126-00",
"System.Xml.XmlDocument": "4.0.0", "System.Xml.XmlDocument": "4.0.1-rc3-24126-00",
"System.Xml.XmlSerializer": "4.0.10" "System.Xml.XmlSerializer": "4.0.11-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
} }
} }
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"NETStandard.Library": "1.5.0-rc2-23931", "NETStandard.Library": "1.5.0-rc3-24126-00",
}, },
"frameworks": { "frameworks": {
"dnxcore50": {} "NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
} }
} }
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"NETStandard.Library": "1.5.0-rc2-23931", "NETStandard.Library": "1.5.0-rc3-24126-00",
"System.Xml.XmlDocument": "4.0.0", "System.Xml.XmlDocument": "4.0.1-rc3-24126-00",
"System.Xml.XmlSerializer": "4.0.10" "System.Xml.XmlSerializer": "4.0.11-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": {} "NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
} }
} }
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"NETStandard.Library": "1.5.0-rc2-23931" "NETStandard.Library": "1.5.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
} }
} }
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24126-00",
"NETStandard.Library": "1.5.0-rc2-23931", "NETStandard.Library": "1.5.0-rc3-24126-00",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc3-24126-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931" "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": {} "NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册