Skip to content

Commit 7363f62

Browse files
committed
Update tests for current environments
1 parent 0053d8d commit 7363f62

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

Mono.TextTemplating.Build.Tests/Mono.TextTemplating.Build.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net48;net6.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
<DefaultItemExcludes>$(DefaultItemExcludes);TestCases\**</DefaultItemExcludes>
66
</PropertyGroup>
@@ -19,7 +19,7 @@
1919
Microsoft.NET.Test.Sdk brings in a version of NuGet.Frameworks that's older than the one used by MSBuild
2020
and loads first, thereby breaking loading of MSBuild assemblies. Force-upgrade it.
2121
-->
22-
<PackageReference Include="NuGet.Frameworks" Version="6.3.1" />
22+
<PackageReference Include="NuGet.Frameworks" Version="6.4.0" />
2323
<PackageReference Include="System.Text.Json" Version="6.0.6" />
2424
</ItemGroup>
2525

Mono.TextTemplating.Tests/ProcessingTests.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ public async Task CSharp9Records ()
5757
await gen.ProcessTemplateAsync (null, template, outputName);
5858

5959
CompilerError firstError = gen.Errors.OfType<CompilerError> ().FirstOrDefault ();
60-
#if NET5_0
61-
Assert.Null (firstError);
62-
#else
60+
61+
// note: when running on netsdk we use the highest available csc regardless of runtime version,
62+
// so records will always be available on our test environments
63+
#if NETFRAMEWORK
6364
Assert.NotNull (firstError);
65+
#else
66+
Assert.Null (firstError);
6467
#endif
6568
}
6669

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Suppressions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<!-- fixes binary incompatibility between multitargeted versions -->
34
<Suppression>
4-
<!-- fixes binary incompatibility between multitargeted versions -->
55
<DiagnosticId>CP0006</DiagnosticId>
66
<Target>M:Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost.ProvideTemplatingAppDomain(System.String)</Target>
77
<Left>lib/netstandard2.0/Mono.TextTemplating.dll</Left>
88
<Right>lib/netstandard2.0/Mono.TextTemplating.dll</Right>
99
<IsBaselineSuppression>true</IsBaselineSuppression>
1010
</Suppression>
11+
<!-- VST4 compat, should not have been public, unlikely to impact users -->
12+
<Suppression>
13+
<DiagnosticId>CP0019</DiagnosticId>
14+
<Target>M:Microsoft.VisualStudio.TextTemplating.DirectiveProcessorException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
15+
<Left>lib/net472/Mono.TextTemplating.dll</Left>
16+
<Right>lib/net472/Mono.TextTemplating.dll</Right>
17+
<IsBaselineSuppression>true</IsBaselineSuppression>
18+
</Suppression>
19+
<Suppression>
20+
<DiagnosticId>CP0019</DiagnosticId>
21+
<Target>M:Microsoft.VisualStudio.TextTemplating.DirectiveProcessorException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
22+
<Left>lib/netstandard2.0/Mono.TextTemplating.dll</Left>
23+
<Right>lib/netstandard2.0/Mono.TextTemplating.dll</Right>
24+
<IsBaselineSuppression>true</IsBaselineSuppression>
25+
</Suppression>
1126
</Suppressions>

0 commit comments

Comments
 (0)