mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move the CLI corefx dependencies from RC2 to RC3 - rc3-24113-00.

Browse source 
- Disable crossgen for windows.Tracked by - https://github.com/dotnet/cli/issues/3059
- And also fix #2974
This commit is contained in:
Sridhar Periyasamy 2016-05-16 12:01:13 -07:00 committed by Livar Cunha
parent 40a2b495ba
commit d2188cd95a
86 changed files with 221 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NuGet.Config
View file

@ -3,6 +3,7 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>

2
TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"PackageWithFakeNativeDep": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24113-00"
},
"buildOptions": {
"emitEntryPoint": true

2
TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-*"
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24113-00"
},
"buildOptions": {
"emitEntryPoint": true

2
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24113-00"
},
"buildOptions": {
"emitEntryPoint": true,

2
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24113-00"
},
"buildOptions": {
"platform": "anycpu32bitpreferred",

2
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24113-00"
},
"buildOptions": {
"emitEntryPoint": true,

2
TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json
View file

@ -9,7 +9,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"imports": [
"portable-net45+win8",

2
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
View file

@ -5,7 +5,7 @@
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
}
}
}

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -6,7 +6,7 @@
}
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-*"

5
TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json
View file

@ -2,10 +2,9 @@
"version": "1.0.0",
"dependencies": {
"TestLibrary": "1.0.0",
"System.IO.Compression": "4.1.0-rc2-24027"
"System.IO.Compression": "4.1.0-rc3-24113-00"
},
"frameworks": {
"net461": {
}
"net461": {}
}
}

2
TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"tools": {
"dotnet-compile-fsc": {

4
TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json
View file

@ -3,9 +3,9 @@
"outputName": "MyLibrary"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

6
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24113-00",
"xunit": "2.1.0"
},
"frameworks": {
@ -17,8 +17,8 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027"
"System.Linq.Expressions": "4.1.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00"
}
},
"net451": {}

4
TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
View file

@ -5,8 +5,8 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Linq.Expressions": "4.1.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24"
},

4
TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json
View file

@ -1,10 +1,10 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

4
TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
View file

@ -10,9 +10,9 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

4
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
View file

@ -10,9 +10,9 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

2
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
View file

@ -8,7 +8,7 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
View file

@ -5,7 +5,7 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netcoreapp1.0": {}

4
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
View file

@ -6,9 +6,9 @@
},
"frameworks": {
"net451": {},
"netstandard1.5": {
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"imports": "portable-net45+win8"
}

4
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
View file

@ -9,9 +9,9 @@
},
"frameworks": {
"net451": {},
"netstandard1.5": {
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"imports": "portable-net45+win8"
}

4
TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
View file

@ -1,13 +1,13 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"System.Runtime.Analyzers": {
"version": "1.1.0",
"type": "build"
}
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

4
TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
View file

@ -10,12 +10,12 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"configurations": {
"Test": {}
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

4
TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
View file

@ -25,10 +25,10 @@
"System.Xml": {}
}
},
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
}
}
}

4
TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json
View file

@ -4,9 +4,9 @@
"xmlDoc": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

2
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
View file

@ -10,7 +10,7 @@
},
"net451": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24113-00"
}
}
}

4
TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json
View file

@ -10,12 +10,12 @@
},
"netcore50": {
"dependencies": {
"System.Private.Uri": "4.0.1-rc2-24027"
"System.Private.Uri": "4.0.1-rc3-24113-00"
}
},
"net99": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24113-00"
}
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -6,7 +6,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -5,7 +5,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

8
TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json
View file

@ -1,16 +1,18 @@
{
"version": "1.0.0-*",
"buildOptions": {
"additionalArguments": [ "/ruleset:../global.ruleset" ]
"additionalArguments": [
"/ruleset:../global.ruleset"
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"System.Runtime.Analyzers": {
"version": "1.1.0",
"type": "build"
}
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.6": {}
}
}

8
build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json
View file

@ -10,12 +10,12 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00",
"System.Diagnostics.Process": "4.1.0-rc3-24113-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.3": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

2
build_projects/dotnet-cli-build/CompileTargets.cs
View file

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.2-rc2-24027";
public static readonly string CoreCLRVersion = "1.0.2-rc3-24113-00";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
public static readonly string[] BinariesForCoreHost = new[]

3
build_projects/dotnet-cli-build/build.ps1
View file

@ -35,6 +35,9 @@ else
$env:DOTNET_BUILD_SKIP_PACKAGING=0
}
Write-Host "Disabling crossgen for the CLI build. See issue - https://github.com/dotnet/cli/issues/3059"
$env:DISABLE_CROSSGEN=1
# Load Branch Info
cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {

12
build_projects/dotnet-cli-build/project.json
View file

@ -5,12 +5,12 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Xml.XmlSerializer": "4.0.11-rc3-24113-00",
"WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
"Microsoft.DotNet.Cli.Build.Framework": { "target": "project" },

12
build_projects/dotnet-host-build/project.json
View file

@ -5,12 +5,12 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Xml.XmlSerializer": "4.0.11-rc3-24113-00",
"WindowsAzure.Storage": "6.2.2-preview",
"Microsoft.DotNet.Cli.Build.Framework": { "target": "project" },

8
build_projects/shared-build-targets-utils/Utils/Crossgen.cs
View file

@ -12,6 +12,11 @@ namespace Microsoft.DotNet.Cli.Build
{
private string _coreClrVersion;
private string _crossGenPath;
private List<string> _excludedLibraries = new List<string>()
{
"mscorlib.dll",
"mscorlib.ni.dll"
};
// This is not always correct. The version of crossgen we need to pick up is whatever one was restored as part
// of the Microsoft.NETCore.Runtime.CoreCLR package that is part of the shared library. For now, the version hardcoded
@ -95,7 +100,8 @@ namespace Microsoft.DotNet.Cli.Build
{
string fileName = Path.GetFileName(file);
if (fileName == "mscorlib.dll" || fileName == "mscorlib.ni.dll" || !PEUtils.HasMetadata(file))
if (_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase))
|| !PEUtils.HasMetadata(file))
{
continue;
}

19
build_projects/shared-build-targets-utils/project.json
View file

@ -2,17 +2,18 @@
"version": "1.0.0-*",
"description": "Build scripts for dotnet-cli",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"WindowsAzure.Storage": "6.2.2-preview"
"NETStandard.Library": "1.5.0-rc3-24113-00",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Xml.XmlSerializer": "4.0.11-rc3-24113-00",
"WindowsAzure.Storage": "6.2.2-preview",
"Microsoft.DotNet.Cli.Build.Framework": {"target":"project"}
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": [
"dnxcore50",
"portable-net45+win8"

2
pkg/deps/project.json
View file

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24113-00"
},
"frameworks": {
"dnxcore50": {

2
pkg/dir.props
View file

@ -23,7 +23,7 @@
<PropertyGroup>
<PackageOutputPath>$(PackagesOutDir)</PackageOutputPath>
<RuntimeIdGraphDefinitionFile>$(ProjectDir)packages\Microsoft.NETCore.Platforms\1.0.1-rc2-24027\runtime.json</RuntimeIdGraphDefinitionFile>
<RuntimeIdGraphDefinitionFile>$(ProjectDir)packages\Microsoft.NETCore.Platforms\1.0.1-rc3-24113-00\runtime.json</RuntimeIdGraphDefinitionFile>
<PackageLicenseFile>$(ProjectDir)projects/dotnet_library_license.txt</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(ProjectDir)projects/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile>
<PackageDescriptionFile>$(ProjectDir)projects/descriptions.json</PackageDescriptionFile>

73
pkg/projects/Microsoft.NETCore.App/project.json
View file

@ -2,42 +2,43 @@
"dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
"Microsoft.CodeAnalysis.VisualBasic": "1.3.0-beta1-20160429-01",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.VisualBasic": "10.0.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Buffers": "4.0.0-rc2-24027",
"System.Collections.Immutable": "1.2.0-rc2-24027",
"System.ComponentModel": "4.0.1-rc2-24027",
"System.ComponentModel.Annotations": "4.1.0-rc2-24027",
"System.Diagnostics.DiagnosticSource": "4.0.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Globalization.Extensions": "4.0.1-rc2-24027",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24027",
"System.IO.MemoryMappedFiles": "4.0.0-rc2-24027",
"System.IO.UnmanagedMemoryStream": "4.0.1-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Linq.Parallel": "4.0.1-rc2-24027",
"System.Linq.Queryable": "4.0.1-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc2-24027",
"System.Net.Requests": "4.0.11-rc2-24027",
"System.Net.Security": "4.0.0-rc2-24027",
"System.Net.WebHeaderCollection": "4.0.1-rc2-24027",
"System.Numerics.Vectors": "4.1.1-rc2-24027",
"System.Reflection.DispatchProxy": "4.0.1-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
"System.Resources.Reader": "4.0.0-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Security.Cryptography.Encoding": "4.0.0-rc2-24027",
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
"System.Threading.Tasks.Dataflow": "4.6.0-rc2-24027",
"System.Threading.Tasks.Extensions": "4.0.0-rc2-24027",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.ThreadPool": "4.0.10-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"Microsoft.VisualBasic": "10.0.1-rc3-24113-00",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"System.Buffers": "4.0.0-rc3-24113-00",
"System.Collections.Immutable": "1.2.0-rc3-24113-00",
"System.ComponentModel": "4.0.1-rc3-24113-00",
"System.ComponentModel.Annotations": "4.1.0-rc3-24113-00",
"System.Diagnostics.DiagnosticSource": "4.0.0-rc3-24113-00",
"System.Diagnostics.Process": "4.1.0-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Globalization.Extensions": "4.0.1-rc3-24113-00",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-24113-00",
"System.IO.MemoryMappedFiles": "4.0.0-rc3-24113-00",
"System.IO.UnmanagedMemoryStream": "4.0.1-rc3-24113-00",
"System.Linq.Expressions": "4.1.0-rc3-24113-00",
"System.Linq.Parallel": "4.0.1-rc3-24113-00",
"System.Linq.Queryable": "4.0.1-rc3-24113-00",
"System.Net.NameResolution": "4.0.0-rc3-24113-00",
"System.Net.Requests": "4.0.11-rc3-24113-00",
"System.Net.Security": "4.0.0-rc3-24113-00",
"System.Net.WebHeaderCollection": "4.0.1-rc3-24113-00",
"System.Numerics.Vectors": "4.1.1-rc3-24113-00",
"System.Reflection.DispatchProxy": "4.0.1-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24113-00",
"System.Resources.Reader": "4.0.0-rc3-24113-00",
"System.Runtime.Loader": "4.0.0-rc3-24113-00",
"System.Security.Cryptography.Algorithms": "4.2.0-rc3-24113-00",
"System.Security.Cryptography.Encoding": "4.0.0-rc3-24113-00",
"System.Security.Cryptography.Primitives": "4.0.0-rc3-24113-00",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24113-00",
"System.Threading.Tasks.Dataflow": "4.6.0-rc3-24113-00",
"System.Threading.Tasks.Extensions": "4.0.0-rc3-24113-00",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-24113-00",
"System.Threading.Thread": "4.0.0-rc3-24113-00",
"System.Threading.ThreadPool": "4.0.10-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}

6
scripts/update-dependencies/project.json
View file

@ -5,9 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -26,7 +26,7 @@
"portable-net45+wp80+win8+wpa81+dnxcore50"
],
"dependencies": {
"System.Diagnostics.Process": "4.1.0-rc2-24027"
"System.Diagnostics.Process": "4.1.0-rc3-24113-00"
}
}
}

2
src/Microsoft.DotNet.Files/project.json
View file

@ -11,7 +11,7 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Linq.Expressions": "4.0.11-rc2-24027"
"System.Linq.Expressions": "4.1.0-rc3-24113-00"
},
"frameworks": {
"net451": {

16
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -10,14 +10,14 @@
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.AppContext": "4.1.0-rc2-24027",
"System.Collections": "4.0.11-rc2-24027",
"System.IO": "4.1.0-rc2-24027",
"System.IO.FileSystem": "4.0.1-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027"
"System.AppContext": "4.1.0-rc3-24113-00",
"System.Collections": "4.0.11-rc3-24113-00",
"System.IO": "4.1.0-rc3-24113-00",
"System.IO.FileSystem": "4.0.1-rc3-24113-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24113-00",
"System.Runtime.Extensions": "4.1.0-rc3-24113-00",
"System.Runtime.InteropServices": "4.1.0-rc3-24113-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24113-00"
}
}
},

2
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -7,7 +7,7 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Runtime.Loader": "4.0.0-rc2-24027"
"System.Runtime.Loader": "4.0.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {

16
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -11,7 +11,7 @@
"Newtonsoft.Json": "7.0.1",
"NuGet.Packaging": "3.5.0-rc-1285",
"NuGet.RuntimeModel": "3.5.0-rc-1285",
"System.Reflection.Metadata": "1.3.0-rc2-24027"
"System.Reflection.Metadata": "1.3.0-rc3-24113-00"
},
"frameworks": {
"net451": {
@ -33,13 +33,13 @@
"dotnet5.4"
],
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Xml.XDocument": "4.0.11-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Runtime.Loader": "4.0.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Security.Cryptography.Algorithms": "4.2.0-rc3-24113-00",
"System.Threading.Thread": "4.0.0-rc3-24113-00",
"System.Xml.XDocument": "4.0.11-rc3-24113-00"
}
}
}

6
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -16,9 +16,9 @@
"netstandard1.5": {
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50",
"dependencies": {
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Linq": "4.1.0-rc2-24027"
"System.Diagnostics.Debug": "4.0.11-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Linq": "4.1.0-rc3-24113-00"
}
}
},

4
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -22,8 +22,8 @@
"portable-net45+win8"
],
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"System.Resources.ResourceManager": "4.0.1-rc3-24113-00",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24113-00"
}
}
},

6
src/corehost/common/pal.windows.cpp
View file

@ -275,18 +275,18 @@ bool pal::pal_clrstring(const pal::string_t& str, std::vector<char>* out)
out->clear();
// Pass -1 as we want explicit null termination in the char buffer.
size_t size = ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, nullptr, 0, nullptr, nullptr);
size_t size = ::WideCharToMultiByte(CP_UTF8, 0, str.c_str(), -1, nullptr, 0, nullptr, nullptr);
if (size == 0)
{
return false;
}
out->resize(size, '\0');
return ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, out->data(), out->size(), nullptr, nullptr) != 0;
return ::WideCharToMultiByte(CP_UTF8, 0, str.c_str(), -1, out->data(), out->size(), nullptr, nullptr) != 0;
}
bool pal::clr_palstring(const char* cstr, pal::string_t* out)
{
return wchar_convert_helper(CP_ACP, cstr, ::strlen(cstr), out);
return wchar_convert_helper(CP_UTF8, cstr, ::strlen(cstr), out);
}
bool pal::realpath(string_t* path)

20
src/dotnet/project.json
View file

@ -26,8 +26,8 @@
},
"NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
"Newtonsoft.Json": "7.0.1",
"System.Text.Encoding.CodePages": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"System.Text.Encoding.CodePages": "4.0.1-rc3-24113-00",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24113-00",
"Microsoft.ApplicationInsights": "2.0.0",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
@ -41,19 +41,19 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-24113-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24113-00",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-24027",
"System.Resources.ReaderWriter": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Private.DataContractSerialization": "4.1.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24113-00",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24113-00",
"System.Resources.Writer": "4.0.0-rc3-24109-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Private.DataContractSerialization": "4.1.1-rc3-24113-00",
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24113-00",
"exclude": "compile"
}
},

2
test/ArgumentForwardingTests/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/EndToEnd/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/Kestrel.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -18,8 +18,8 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"NuGet.Versioning": "3.5.0-rc-1285",
"NuGet.Packaging": "3.5.0-rc-1285",
"NuGet.Frameworks": "3.5.0-rc-1285",

2
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/Microsoft.DotNet.ProjectModel.Tests/project.json
View file

@ -13,7 +13,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public abstract class TestBase : IDisposable
{
protected const string DefaultFramework = "netcoreapp1.0";
protected const string DefaultLibraryFramework = "netstandard1.5";
protected const string DefaultLibraryFramework = "netstandard1.6";
private TempRoot _temp;
private static TestAssetsManager s_testsAssetsMgr;
private static string s_repoRoot;

2
test/Microsoft.Extensions.DependencyModel.Tests/project.json
View file

@ -9,7 +9,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/Performance/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
View file

@ -8,7 +8,7 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
View file

@ -8,8 +8,8 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Diagnostics.Process": "4.1.0-rc3-24113-00",
"TestAppWithPortablePdbs": {
"target": "project"
},

2
test/TestingAbstractions/TestAppWithFullPdbs/project.json
View file

@ -4,7 +4,7 @@
"debugType": "full"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}

2
test/TestingAbstractions/TestAppWithPortablePdbs/project.json
View file

@ -4,7 +4,7 @@
"debugType": "portable"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.5": {}

2
test/binding-redirects.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
}

4
test/crossgen.Tests/crossgen.Tests.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
/// </summary>
public class CrossgenTests : TestBase
{
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void CLI_SDK_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();
@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Tests
CheckDirectoryIsCrossgened(cliPath);
}
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void Shared_Fx_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();

2
test/dotnet-build.Tests/BuildOutputTests.cs
View file

@ -199,7 +199,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
// [InlineData("net20", false, true)]
// [InlineData("net40", true, true)]
// [InlineData("net461", true, true)]
[InlineData("netstandard1.5", true, false)]
[InlineData("netstandard1.6", true, false)]
public void MultipleFrameworks_ShouldHaveValidTargetFrameworkAttribute(string frameworkName, bool shouldHaveTargetFrameworkAttribute, bool windowsOnly)
{
var framework = NuGetFramework.Parse(frameworkName);

2
test/dotnet-build.Tests/IncrementalTestBase.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
{
public class IncrementalTestBase : TestBase
{
protected readonly string _libraryFrameworkFullName = ".NETStandard,Version=v1.5";
protected readonly string _libraryFrameworkFullName = ".NETStandard,Version=v1.6";
protected readonly string _appFrameworkFullName = ".NETCoreApp,Version=v1.0";
protected virtual string MainProject

2
test/dotnet-build.Tests/ProjectNameArgumentTests.cs
View file

@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
result.Should().Pass();
foreach (var expectedProject in expectedProjects)
{
result.Should().HaveSkippedProjectCompilation(expectedProject, NuGetFramework.Parse("netstandard1.5").DotNetFrameworkName);
result.Should().HaveSkippedProjectCompilation(expectedProject, NuGetFramework.Parse("netstandard1.6").DotNetFrameworkName);
}
}
else

2
test/dotnet-build.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/dotnet-compile.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/dotnet-compile.UnitTests/project.json
View file

@ -23,7 +23,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24113-00",
"exclude": "Compile"
},
"Microsoft.DotNet.ProjectModel": {

8
test/dotnet-pack.Tests/PackTests.cs
View file

@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
File.Exists(outputPackage).Should().BeTrue(outputPackage);
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/TestLibraryWithConfiguration.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/TestLibraryWithConfiguration.dll");
}
[Fact]
@ -127,13 +127,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
var outputPackage = Path.Combine(testInstance.TestRoot, "bin", "Debug", "LibraryWithOutputAssemblyName.1.0.0.nupkg");
File.Exists(outputPackage).Should().BeTrue(outputPackage);
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.dll");
var symbolsPackage = Path.Combine(testInstance.TestRoot, "bin", "Debug", "LibraryWithOutputAssemblyName.1.0.0.symbols.nupkg");
File.Exists(symbolsPackage).Should().BeTrue(symbolsPackage);
zip = ZipFile.Open(symbolsPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.pdb");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.pdb");
}
[Fact]

4
test/dotnet-pack.Tests/project.json
View file

@ -5,8 +5,8 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.IO.Compression.ZipFile": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.IO.Compression.ZipFile": "4.0.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/dotnet-projectmodel-server.Tests/project.json
View file

@ -8,7 +8,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24113-00",
"exclude": "Compile"
},
"Microsoft.DotNet.Tools.Tests.Utilities": {
@ -19,7 +19,7 @@
},
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"System.Net.NameResolution": "4.0.0-rc2-24027"
"System.Net.NameResolution": "4.0.0-rc3-24113-00"
},
"frameworks": {
"netcoreapp1.0": {

2
test/dotnet-publish.Tests/PublishTests.cs
View file

@ -230,7 +230,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
publishCommand.GetOutputDirectory().Should().HaveFile("Newtonsoft.Json.dll");
publishCommand.GetOutputDirectory().Delete(true);
publishCommand = new PublishCommand(lesserTestProject, "netstandard1.5", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand = new PublishCommand(lesserTestProject, "netstandard1.6", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");

8
test/dotnet-publish.Tests/project.json
View file

@ -5,15 +5,17 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.TestFramework": { "target": "project" },
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.TestFramework": {
"target": "project"
},
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
"xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027"
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24113-00"
},
"frameworks": {
"netcoreapp1.0": {

2
test/dotnet-resgen.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/dotnet-run.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

6
test/dotnet-test.Tests/project.json
View file

@ -15,9 +15,9 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Net.NameResolution": "4.0.0-rc2-24027",
"System.Net.Sockets": "4.1.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc3-24113-00",
"System.Net.Sockets": "4.1.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24"
},

2
test/dotnet-test.UnitTests/project.json
View file

@ -10,7 +10,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24113-00",
"exclude": "Compile"
},
"xunit": "2.1.0",

2
test/dotnet.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

5
tools/MultiProjectValidator/project.json
View file

@ -5,7 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24113-00",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -14,7 +15,7 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50"
]

9
tools/RuntimeGraphGenerator/project.json
View file

@ -7,18 +7,19 @@
"NuGet.RuntimeModel": "3.5.0-rc-1285",
"NuGet.Versioning": "3.5.0-rc-1285",
"System.CommandLine": "0.1.0-e160119-1",
"System.Runtime.Serialization.Json": "4.0.2-rc2-24027",
"System.Runtime.Serialization.Json": "4.0.2-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
},
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-24113-00",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8+wpa81+dnxcore50"