Use net6.0 in tests.

JohanLarsson · JohanLarsson · commit ee2f06e36ca9 · 2021-11-23T12:09:23.000+01:00
diff --git a/PropertyChangedAnalyzers.Benchmarks/PropertyChangedAnalyzers.Benchmarks.csproj b/PropertyChangedAnalyzers.Benchmarks/PropertyChangedAnalyzers.Benchmarks.csproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/PropertyChangedAnalyzers.Test/Helpers/SpecialMetadataReferences.cs b/PropertyChangedAnalyzers.Test/Helpers/SpecialMetadataReferences.cs
@@ -27,7 +27,7 @@ private static Assembly LoadUnsigned(string dllName)
             if (ProjectDirectory.EnumerateFiles(dllName, SearchOption.AllDirectories)
                                 .TryFirst(out var dll))
             {
-                return Assembly.ReflectionOnlyLoadFrom(dll.FullName);
+                return Assembly.LoadFile(dll.FullName);
             }
 
             throw new FileNotFoundException(dllName);
diff --git a/PropertyChangedAnalyzers.Test/NullableFixTests/NullableFixTests.cs b/PropertyChangedAnalyzers.Test/NullableFixTests/NullableFixTests.cs
@@ -11,12 +11,13 @@ public static class NullableFixTests
         private static readonly CodeFixProvider Fix = new NullableFix();
         private static readonly ExpectedDiagnostic CS8618 = ExpectedDiagnostic.Create("CS8618");
         private static readonly ExpectedDiagnostic CS8625 = ExpectedDiagnostic.Create("CS8625", "Cannot convert null literal to non-nullable reference type.");
-        private static readonly CSharpCompilationOptions CompilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, nullableContextOptions: NullableContextOptions.Enable);
+        private static readonly CSharpCompilationOptions CompilationOptions = new(OutputKind.DynamicallyLinkedLibrary, nullableContextOptions: NullableContextOptions.Enable);
 
         [Test]
         public static void DeclareEventNullable()
         {
             var before = @"
+#pragma warning disable CS8612
 namespace N
 {
     using System.ComponentModel;
@@ -50,6 +51,7 @@ protected virtual void OnPropertyChanged(string propertyName)
 }";
 
             var after = @"
+#pragma warning disable CS8612
 namespace N
 {
     using System.ComponentModel;
@@ -88,6 +90,7 @@ protected virtual void OnPropertyChanged(string propertyName)
         public static void DeclareEventNullableWhenConstructor()
         {
             var before = @"
+#pragma warning disable CS8612
 namespace N
 {
     using System.ComponentModel;
@@ -126,6 +129,7 @@ protected virtual void OnPropertyChanged(string propertyName)
 }";
 
             var after = @"
+#pragma warning disable CS8612
 namespace N
 {
     using System.ComponentModel;
diff --git a/PropertyChangedAnalyzers.Test/PropertyChangedAnalyzers.Test.csproj b/PropertyChangedAnalyzers.Test/PropertyChangedAnalyzers.Test.csproj
@@ -1,7 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
@@ -20,13 +21,6 @@
     <ProjectReference Include="..\PropertyChangedAnalyzers\PropertyChangedAnalyzers.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Caliburn.Micro" Version="3.2" />
     <PackageReference Include="Gu.Analyzers" Version="2.0.0" PrivateAssets="all" />
@@ -37,7 +31,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MvvmCross" Version="8.0.2" />
-    <PackageReference Include="MvvmLight" Version="5.4.1.1" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Prism.Mvvm" Version="1.1.1" />
diff --git a/ValidCode/ValidCode.csproj b/ValidCode/ValidCode.csproj
@@ -1,26 +1,20 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
     <LangVersion>latest</LangVersion>
     <Nullable>Enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Caliburn.Micro" Version="4.0.62-alpha" />
+    <PackageReference Include="Caliburn.Micro" Version="3.2" />
     <PackageReference Include="Gu.Wpf.Reactive" Version="5.0.1" />
     <PackageReference Include="MvvmCross" Version="8.0.2" />
-    <PackageReference Include="MvvmLight" Version="5.4.1.1" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Prism.Wpf" Version="8.1.97" />
     <PackageReference Include="PropertyChangedAnalyzers" Version="4.0.0" PrivateAssets="all" />
     <PackageReference Include="ReflectionAnalyzers" Version="0.3.0" PrivateAssets="all" />
     <PackageReference Include="Stylet" Version="1.3.6" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,6 +5,9 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+- task: UseDotNet@2
+  inputs:
+    version: 6.0.x
 
 - task: VSBuild@1
   displayName: Build

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ private static Assembly LoadUnsigned(string dllName)`
`27`	`27`	`if (ProjectDirectory.EnumerateFiles(dllName, SearchOption.AllDirectories)`
`28`	`28`	`.TryFirst(out var dll))`
`29`	`29`	`{`
`30`		`- return Assembly.ReflectionOnlyLoadFrom(dll.FullName);`
	`30`	`+ return Assembly.LoadFile(dll.FullName);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`throw new FileNotFoundException(dllName);`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@ public static class NullableFixTests`
`11`	`11`	`private static readonly CodeFixProvider Fix = new NullableFix();`
`12`	`12`	`private static readonly ExpectedDiagnostic CS8618 = ExpectedDiagnostic.Create("CS8618");`
`13`	`13`	`private static readonly ExpectedDiagnostic CS8625 = ExpectedDiagnostic.Create("CS8625", "Cannot convert null literal to non-nullable reference type.");`
`14`		`- private static readonly CSharpCompilationOptions CompilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, nullableContextOptions: NullableContextOptions.Enable);`
	`14`	`+ private static readonly CSharpCompilationOptions CompilationOptions = new(OutputKind.DynamicallyLinkedLibrary, nullableContextOptions: NullableContextOptions.Enable);`
`15`	`15`
`16`	`16`	`[Test]`
`17`	`17`	`public static void DeclareEventNullable()`
`18`	`18`	`{`
`19`	`19`	`var before = @"`
	`20`	`+#pragma warning disable CS8612`
`20`	`21`	`namespace N`
`21`	`22`	`{`
`22`	`23`	`using System.ComponentModel;`
`@@ -50,6 +51,7 @@ protected virtual void OnPropertyChanged(string propertyName)`
`50`	`51`	`}";`
`51`	`52`
`52`	`53`	`var after = @"`
	`54`	`+#pragma warning disable CS8612`
`53`	`55`	`namespace N`
`54`	`56`	`{`
`55`	`57`	`using System.ComponentModel;`
`@@ -88,6 +90,7 @@ protected virtual void OnPropertyChanged(string propertyName)`
`88`	`90`	`public static void DeclareEventNullableWhenConstructor()`
`89`	`91`	`{`
`90`	`92`	`var before = @"`
	`93`	`+#pragma warning disable CS8612`
`91`	`94`	`namespace N`
`92`	`95`	`{`
`93`	`96`	`using System.ComponentModel;`
`@@ -126,6 +129,7 @@ protected virtual void OnPropertyChanged(string propertyName)`
`126`	`129`	`}";`
`127`	`130`
`128`	`131`	`var after = @"`
	`132`	`+#pragma warning disable CS8612`
`129`	`133`	`namespace N`
`130`	`134`	`{`
`131`	`135`	`using System.ComponentModel;`