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

Fix the tests for targeting netstandard1.3.

Browse source
This commit is contained in:
Eric Erhardt 2016-10-11 16:01:03 -05:00
parent eec324a844
commit 38753d42b0
11 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/project.json
View file

@ -15,7 +15,7 @@
"dotnet-desktop-binding-redirects": "1.0.0-*" "dotnet-desktop-binding-redirects": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": {} "net46": {}
}, },
"tools": { "tools": {
"dotnet-dependency-tool-invoker": { "dotnet-dependency-tool-invoker": {

2
TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/project.json
View file

@ -15,7 +15,7 @@
"dotnet-desktop-binding-redirects": "1.0.0-*" "dotnet-desktop-binding-redirects": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": {} "net46": {}
}, },
"tools": { "tools": {
"dotnet-dependency-tool-invoker": { "dotnet-dependency-tool-invoker": {

11
TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json
View file

@ -9,6 +9,15 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"frameworks": { "frameworks": {
"net451": {} "net46": {
"frameworkAssemblies": {
"System.Runtime": {
"type": "build"
},
"System.IO": {
"type": "build"
}
}
}
} }
} }

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

@ -20,7 +20,7 @@
"System.Runtime.Serialization.Primitives": "4.1.1" "System.Runtime.Serialization.Primitives": "4.1.1"
} }
}, },
"net451": {} "net46": {}
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

2
build/Microsoft.DotNet.Cli.Test.targets
View file

@ -175,7 +175,7 @@
<Message Text="%(NoAutoBuildDesktopTestAssetProjects.FullPath)" /> <Message Text="%(NoAutoBuildDesktopTestAssetProjects.FullPath)" />
<DotNetBuild Configuration="$(Configuration)" <DotNetBuild Configuration="$(Configuration)"
Framework="net451" Framework="net46"
ProjectPath="%(BuildableDesktopTestAssetProjects.FullPath)" ProjectPath="%(BuildableDesktopTestAssetProjects.FullPath)"
ToolPath="$(DotnetUnderTest)" ToolPath="$(DotnetUnderTest)"
WorkingDirectory="%(BuildableDesktopTestAssetProjects.RelativeDir)" /> WorkingDirectory="%(BuildableDesktopTestAssetProjects.RelativeDir)" />

14
build/test/TestPackageProjects.targets
View file

@ -159,7 +159,7 @@
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview3-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>net451;netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel"> <BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel">
<Name>Microsoft.DotNet.ProjectModel</Name> <Name>Microsoft.DotNet.ProjectModel</Name>
@ -168,7 +168,7 @@
<VersionPrefix>1.0.0-rc4-</VersionPrefix> <VersionPrefix>1.0.0-rc4-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>net451;netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel.Loader"> <BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel.Loader">
<Name>Microsoft.DotNet.ProjectModel.Loader</Name> <Name>Microsoft.DotNet.ProjectModel.Loader</Name>
@ -186,7 +186,7 @@
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview3-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions"> <BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
<Name>Microsoft.DotNet.InternalAbstractions</Name> <Name>Microsoft.DotNet.InternalAbstractions</Name>
@ -195,7 +195,7 @@
<VersionPrefix>1.0.1-beta-</VersionPrefix> <VersionPrefix>1.0.1-beta-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>net451;netstandard1.3</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions"> <BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions">
<Name>Microsoft.Extensions.Testing.Abstractions</Name> <Name>Microsoft.Extensions.Testing.Abstractions</Name>
@ -204,7 +204,7 @@
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview3-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>net451;netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.Compiler.Common"> <BaseTestPackageProject Include="src/Microsoft.DotNet.Compiler.Common">
<Name>Microsoft.DotNet.Compiler.Common</Name> <Name>Microsoft.DotNet.Compiler.Common</Name>
@ -213,7 +213,7 @@
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview3-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.Files"> <BaseTestPackageProject Include="src/Microsoft.DotNet.Files">
<Name>Microsoft.DotNet.Files</Name> <Name>Microsoft.DotNet.Files</Name>
@ -222,7 +222,7 @@
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview3-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>netstandard1.6</Frameworks> <Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/dotnet-compile-fsc"> <BaseTestPackageProject Include="src/dotnet-compile-fsc">
<Name>dotnet-compile-fsc</Name> <Name>dotnet-compile-fsc</Name>

2
build/test/TestProjects.targets
View file

@ -86,7 +86,7 @@
</TestProjects> </TestProjects>
<TestProjects Condition=" '%(RelativeDir)' == 'test\binding-redirects.Tests\' "> <TestProjects Condition=" '%(RelativeDir)' == 'test\binding-redirects.Tests\' ">
<Framework>net451</Framework> <Framework>net46</Framework>
</TestProjects> </TestProjects>
<TestProjects Condition=" '%(RelativeDir)' == 'test\Installer\Microsoft.DotNet.Cli.Msi.Tests\' "> <TestProjects Condition=" '%(RelativeDir)' == 'test\Installer\Microsoft.DotNet.Cli.Msi.Tests\' ">
<Framework>net46</Framework> <Framework>net46</Framework>

7
src/Microsoft.Extensions.Testing.Abstractions/MetadataExtensions.cs
View file

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Reflection; using System.Reflection;
using System.Reflection.Metadata; using System.Reflection.Metadata;
using System.Reflection.Metadata.Ecma335; using System.Reflection.Metadata.Ecma335;
@ -9,11 +10,11 @@ namespace Microsoft.Extensions.Testing.Abstractions
{ {
internal static class MetadataExtensions internal static class MetadataExtensions
{ {
private static PropertyInfo s_methodInfoMethodTokenProperty = typeof(MethodInfo).GetProperty("MethodToken");
internal static int GetMethodToken(this MethodInfo methodInfo) internal static int GetMethodToken(this MethodInfo methodInfo)
{ {
var methodToken = methodInfo.MetadataToken; return (int)s_methodInfoMethodTokenProperty.GetValue(methodInfo);
return methodToken;
} }
internal static MethodDebugInformationHandle GetMethodDebugInformationHandle(this MethodInfo methodInfo) internal static MethodDebugInformationHandle GetMethodDebugInformationHandle(this MethodInfo methodInfo)

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

@ -16,7 +16,7 @@
"System.Reflection.Metadata": "1.4.1-beta-24426-02" "System.Reflection.Metadata": "1.4.1-beta-24426-02"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.3": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+wp80+win8+wpa81+dnxcore50",
"portable-net45+win8" "portable-net45+win8"

2
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -30,7 +30,7 @@
"System.Collections.Immutable": "1.2.0-rc2-24022", "System.Collections.Immutable": "1.2.0-rc2-24022",
"System.Net.NetworkInformation": "4.1.0-rc2-24022" "System.Net.NetworkInformation": "4.1.0-rc2-24022"
}, },
"net451": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": { "System.Runtime": {
"type": "build" "type": "build"

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

@ -9,7 +9,7 @@
} }
}, },
"frameworks": { "frameworks": {
"net451": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Configuration": "" "System.Configuration": ""
} }