Skip to content

Commit 0110c9b

Browse files
dsplaisteddsplaisted
committed
Add TestConfig with SDK tests to skip, and other fixes for SDK tests
1 parent 33056a7 commit 0110c9b

File tree

2 files changed

+105
-2
lines changed

2 files changed

+105
-2
lines changed

‎test/SdkTests/SdkTests.csproj‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<PropertyGroup>
2727
<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
2828
<DotnetToTestPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\</DotnetToTestPath>
29+
<TestExecutionDirectory>$([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests'))</TestExecutionDirectory>
2930
</PropertyGroup>
3031

3132
<ItemGroup>
@@ -109,10 +110,33 @@
109110

110111
<!-- Isolate test working directory from higher-level Directory.Build files -->
111112
<Copy SourceFiles="$(RepoRoot)TestAssets\Directory.Build.props;$(RepoRoot)TestAssets\Directory.Build.targets"
112-
DestinationFolder="$(ArtifactsTmpDir)/dotnetSdkTests"
113+
DestinationFolder="$(TestExecutionDirectory)"
113114
SkipUnchangedFiles="true"
114115
/>
115116

117+
<!-- Set up NuGet feeds -->
118+
<PropertyGroup>
119+
<GeneratedNuGetConfig>$(TestExecutionDirectory)\NuGet.config</GeneratedNuGetConfig>
120+
<NugetConfigContents>
121+
<![CDATA[
122+
<configuration>
123+
<packageSources>
124+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
125+
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
126+
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
127+
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
128+
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
129+
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
130+
</packageSources>
131+
</configuration>
132+
]]>
133+
</NugetConfigContents>
134+
</PropertyGroup>
135+
136+
<WriteLinesToFile File="$(GeneratedNuGetConfig)"
137+
Lines="$(NugetConfigContents)"
138+
Overwrite="true" />
139+
116140
<!-- Allow test list to be overridden with ToolTestName property -->
117141
<ItemGroup Condition="'$(ToolTestName)' != ''">
118142
<SdkTest Remove="@(SdkTest)" />
@@ -167,7 +191,8 @@
167191

168192
<TestArgs>-noautoreporters -noRepoInference</TestArgs>
169193
<TestArgs>$(TestArgs) -dotnetPath $(DotnetToTestPath)\dotnet</TestArgs>
170-
<TestArgs>$(TestArgs) -testExecutionDirectory $(ArtifactsTmpDir)/dotnetSdkTests</TestArgs>
194+
<TestArgs>$(TestArgs) -testExecutionDirectory $(TestExecutionDirectory)</TestArgs>
195+
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestConfig.xml"</TestArgs>
171196
<TestArgs>$(TestArgs) -xml "$(ResultsXmlPath)"</TestArgs>
172197
<TestArgs>$(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments)</TestArgs>
173198
<TestArgs>$(TestArgs) &gt; $(ResultsStdOutPath)</TestArgs>

‎test/SdkTests/TestConfig.xml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<Tests>
2+
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.RuntimeFrameworkVersionCanBeSpecifiedOnFrameworkReference"
3+
Skip="true"
4+
Issue="https://github.com/dotnet/sdk/pull/3221"
5+
Reason="Code flow needed"/>
6+
7+
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetingPackVersionCanBeSpecifiedOnFrameworkReference"
8+
Skip="true"
9+
Issue="https://github.com/dotnet/sdk/pull/3221"
10+
Reason="Code flow needed"/>
11+
12+
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetLatestPatchCanBeSpecifiedOnFrameworkReference"
13+
Skip="true"
14+
Issue="https://github.com/dotnet/sdk/pull/3221"
15+
Reason="Code flow needed"/>
16+
17+
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromPackageReference"
18+
Skip="true"
19+
Issue="https://github.com/dotnet/sdk/pull/3221"
20+
Reason="Code flow needed"/>
21+
22+
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromProjectReference"
23+
Skip="true"
24+
Issue="https://github.com/dotnet/sdk/pull/3221"
25+
Reason="Code flow needed"/>
26+
27+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.AProjectCanReferenceADllInAPackageDirectly"
28+
Skip="true"
29+
Issue="https://github.com/dotnet/sdk/pull/3214"
30+
Reason="Code flow needed"/>
31+
32+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
33+
Skip="true"
34+
Issue=""
35+
Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/>
36+
37+
38+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
39+
Skip="true"
40+
Issue=""
41+
Reason="Test doesn't work with newer RIDs"/>
42+
43+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
44+
Skip="true"
45+
Issue=""
46+
Reason="Test doesn't work with newer RIDs"/>
47+
48+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_handles_mismatched_implicit_package_versions"
49+
Skip="true"
50+
Issue=""
51+
Reason="Test doesn't work with newer RIDs"/>
52+
53+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs"
54+
Skip="true"
55+
Issue=""
56+
Reason="Needs .NET Core 1.1"/>
57+
58+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully"
59+
Skip="true"
60+
Issue=""
61+
Reason="Needs .NET Core 1.1"/>
62+
63+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully_twice"
64+
Skip="true"
65+
Issue=""
66+
Reason="Needs .NET Core 1.1"/>
67+
68+
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.TestSatelliteResources"
69+
Skip="true"
70+
Issue=""
71+
Reason="Needs .NET Core 1.1"/>
72+
73+
<Method Name="Microsoft.NET.Build.Tests.GivenThereAreDefaultItems.Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used"
74+
Skip="true"
75+
Issue=""
76+
Reason="Needs .NET Core 1.1"/>
77+
78+
</Tests>

0 commit comments

Comments
 (0)