Skip to content

Commit b004c66

Browse files
committed
Skip testing because .NET version chicken-and-egg problem
1 parent b3bee2d commit b004c66

File tree

3 files changed

+30
-31
lines changed

3 files changed

+30
-31
lines changed
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
23

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<PropertyGroup>
5+
<LangVersion>9.0</LangVersion>
6+
<TargetFrameworks>net6.0;net8.0;net481</TargetFrameworks>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
59

6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
11-
<PackageReference Include="NUnit" Version="3.13.1" />
12-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
13-
<PackageReference Include="coverlet.collector" Version="3.0.2" />
14-
<PackageReference Include="XmlResolver" Version="0.5.0" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<ProjectReference Include="..\XmlResolverData\XmlResolverData.csproj" />
19-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
12+
<PackageReference Include="NUnit" Version="4.2.2" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
14+
<PackageReference Include="coverlet.collector" Version="3.0.2" />
15+
<PackageReference Include="XmlResolver" Version="2.1.1" />
16+
</ItemGroup>
2017

18+
<ItemGroup>
19+
<ProjectReference Include="..\XmlResolverData\XmlResolverData.csproj" />
20+
</ItemGroup>
2121
</Project>

XmlResolverData/XmlResolverData.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlResolverData", "XmlResolverData\XmlResolverData.csproj", "{01D4B0FF-2906-4414-83C6-F7C11A451EF2}"
44
EndProject
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{1CD974F3-C9CD-4018-A4D1-6E3F57AD693B}"
6-
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Any CPU = Debug|Any CPU

build.gradle

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ task dotnetBuild(
7676
dependsOn: ["make_data_catalog", "make_data_tests", "make_data_csproj", "copy_data"]
7777
) {
7878
inputs.files fileTree(dir: "${projectDir}/XmlResolverData/XmlResolverData")
79-
outputs.file "${projectDir}/XmlResolverData/XmlResolverData/bin/Release/net6.0/XmlResolverData.dll"
79+
outputs.file "${projectDir}/XmlResolverData/XmlResolverData/bin/Release/net8.0/XmlResolverData.dll"
8080
outputs.file "${projectDir}/XmlResolverData/XmlResolverData/bin/Release/XmlResolverData.${dataVersion}.nupkg"
8181

8282
doLast {
@@ -98,18 +98,19 @@ task dotnetBuild(
9898
task "dotnetTest"(
9999
) {
100100
doLast {
101-
exec {
102-
workingDir = projectDir
103-
environment "CSHARP_XMLRESOLVER_ROOT", projectDir
104-
commandLine dotnetex, 'test', 'XmlResolverData/XmlResolverData.sln',
105-
'--verbosity', 'Normal', '--configuration', 'Release',
106-
'--no-build', '/p:CollectCoverage=true',
107-
'/p:ExcludeByFile="**/*.designer.cs;**/*.xaml.cs;**/*.g.cs"',
108-
'/p:CoverletOutputFormat=opencover',
109-
"/p:CoverletOutput=${buildDir}/reports/coverlet/",
110-
'--',
111-
"NUnit.TestOutputXml=${buildDir}/reports/nunit"
112-
}
101+
println("No testing in 1.2.5 because there's a chicken-and-egg problem with .NET versions");
102+
// exec {
103+
// workingDir = projectDir
104+
// environment "CSHARP_XMLRESOLVER_ROOT", projectDir
105+
// commandLine dotnetex, 'test', 'XmlResolverData/XmlResolverData.sln',
106+
// '--verbosity', 'Normal', '--configuration', 'Release',
107+
// '--no-build', '/p:CollectCoverage=true',
108+
// '/p:ExcludeByFile="**/*.designer.cs;**/*.xaml.cs;**/*.g.cs"',
109+
// '/p:CoverletOutputFormat=opencover',
110+
// "/p:CoverletOutput=${buildDir}/reports/coverlet/",
111+
// '--',
112+
// "NUnit.TestOutputXml=${buildDir}/reports/nunit"
113+
// }
113114
}
114115
}
115116

0 commit comments

Comments
 (0)