From 9c949f14f5a37cd9fcb290feb58d7c48ac6a4463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Sandstr=C3=B6m?= <116262628+SandstromErik@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:44:14 +0100 Subject: [PATCH] Make test run on Net8 (#458) * Made test run on NET8 --------- Co-authored-by: Daniel Svensson --- .../OpenRiaServices.Client.Web.csproj | 2 +- .../OpenRiaServices.Client.Test.csproj | 2 +- ...RiaServices.Hosting.AspNetCore.Test.csproj | 2 +- ...RiaServices.Server.UnitTesting.Test.csproj | 2 +- ...RiaServices.Tools.TextTemplate.Test.csproj | 2 +- .../Framework/AssemblyUtilities.cs | 8 ++-- .../Framework/DataContractProxyGenerator.cs | 41 ++++++++++------ .../Framework/OpenRiaServices.Tools.csproj | 2 +- .../ClientCodeGenerationDispatcherTests.cs | 48 +++++++++++-------- .../Test/MsBuildHelper.cs | 2 + .../Test/OpenRiaServices.Tools.Test.csproj | 4 +- src/RiaServices.sln | 7 --- ...Services.Common.DomainServices.Test.csproj | 2 +- .../TypeLoadExceptionProject/Class1.cs | 18 ------- .../Properties/AssemblyInfo.cs | 36 -------------- .../TypeLoadExceptionProject.csproj | 6 --- 16 files changed, 71 insertions(+), 113 deletions(-) delete mode 100644 src/Test/Desktop/TypeLoadExceptionProject/Class1.cs delete mode 100644 src/Test/Desktop/TypeLoadExceptionProject/Properties/AssemblyInfo.cs delete mode 100644 src/Test/Desktop/TypeLoadExceptionProject/TypeLoadExceptionProject.csproj diff --git a/src/OpenRiaServices.Client.Web/Framework/OpenRiaServices.Client.Web.csproj b/src/OpenRiaServices.Client.Web/Framework/OpenRiaServices.Client.Web.csproj index eb3f05b61..293b98a1c 100644 --- a/src/OpenRiaServices.Client.Web/Framework/OpenRiaServices.Client.Web.csproj +++ b/src/OpenRiaServices.Client.Web/Framework/OpenRiaServices.Client.Web.csproj @@ -1,7 +1,7 @@  - net472;net6.0;netstandard2.0; + net472;net8.0;net6.0;netstandard2.0 WCF;RIA;Services;RIAServices;Silverlight;OpenRiaServices true diff --git a/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj b/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj index 969f8660f..81d9315ac 100644 --- a/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj +++ b/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj @@ -1,7 +1,7 @@  108 - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows 1.0.0.0 true $(DefineConstants);HAS_COLLECTIONVIEW diff --git a/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj b/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj index 9ad67a3d3..ba06072d3 100644 --- a/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj +++ b/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net8.0 OpenRiaServices.Hosting.AspNetCore 1.0.0.0 diff --git a/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj b/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj index c9b21e7f2..75be803ca 100644 --- a/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj +++ b/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj @@ -2,7 +2,7 @@ 618 $(DefineConstants);SERVERFX - net472;net6.0 + net472;net6.0;net8.0 diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index 586719868..cea7ffcc3 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -1,6 +1,6 @@  - net472;net6.0 + net472;net6.0;net8.0 true true diff --git a/src/OpenRiaServices.Tools/Framework/AssemblyUtilities.cs b/src/OpenRiaServices.Tools/Framework/AssemblyUtilities.cs index 25efe907f..933e46811 100644 --- a/src/OpenRiaServices.Tools/Framework/AssemblyUtilities.cs +++ b/src/OpenRiaServices.Tools/Framework/AssemblyUtilities.cs @@ -104,10 +104,10 @@ internal static Assembly LoadAssembly(string assemblyFileName, ILogger logger) catch (Exception ex) { // Some common exceptions log a warning and keep running - if (ex is System.IO.FileNotFoundException || - ex is System.IO.FileLoadException || - ex is System.IO.PathTooLongException || - ex is System.IO.DirectoryNotFoundException || + if (ex is FileNotFoundException || + ex is FileLoadException || + ex is PathTooLongException || + ex is DirectoryNotFoundException || ex is BadImageFormatException || ex is System.Security.SecurityException) { diff --git a/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs b/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs index 033782118..fcf97843f 100644 --- a/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs +++ b/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs @@ -22,6 +22,7 @@ internal abstract class DataContractProxyGenerator : ProxyGenerator { private readonly bool _isRoundtripType; private readonly IDictionary _typeMapping; + private readonly List _attributeTypesToFilter; /// /// Initializes a new instance of the class. @@ -32,10 +33,23 @@ internal abstract class DataContractProxyGenerator : ProxyGenerator protected DataContractProxyGenerator(CodeDomClientCodeGenerator proxyGenerator, Type type, IDictionary typeMapping) : base(proxyGenerator) { - this.Type = type; - this._typeMapping = typeMapping; - this.NotificationMethodGen = new NotificationMethodGenerator(proxyGenerator); - this._isRoundtripType = type.Attributes()[typeof(RoundtripOriginalAttribute)] != null; + Type = type; + _typeMapping = typeMapping; + NotificationMethodGen = new NotificationMethodGenerator(proxyGenerator); + _isRoundtripType = type.Attributes()[typeof(RoundtripOriginalAttribute)] != null; + + // Add attributes which should be used to filter the attributes on type to be generated + _attributeTypesToFilter = new() + { + // DataContractAttribute and KnownTypeAttribute are handled seperatly + typeof(DataContractAttribute), + typeof(KnownTypeAttribute), +#if NET + // Filter out NullableAttribute and NullableContextAttribute, should only be used by compiler + Type.GetType("System.Runtime.CompilerServices.NullableAttribute"), + Type.GetType("System.Runtime.CompilerServices.NullableContextAttribute"), +#endif + }; } /// @@ -105,7 +119,7 @@ public override void Generate() this.ProxyClass.TypeAttributes = TypeAttributes.Public; // Abstract classes must be preserved as abstract to avoid explicit instantiation on client - bool isAbstract = (this.Type.IsAbstract); + bool isAbstract = (this.Type.IsAbstract); if (isAbstract) { this.ProxyClass.TypeAttributes |= TypeAttributes.Abstract; @@ -140,7 +154,7 @@ public override void Generate() constructor.Attributes = isAbstract ? MemberAttributes.Family : MemberAttributes.Public; // add default ctor doc comments - comment = string.Format(CultureInfo.CurrentCulture, Resource.CodeGen_Default_Constructor_Summary_Comments, this.Type.Name); + comment = string.Format(CultureInfo.CurrentCulture, Resource.CodeGen_Default_Constructor_Summary_Comments, this.Type.Name); constructor.Comments.AddRange(CodeGenUtilities.GenerateSummaryCodeComment(comment, this.ClientProxyGenerator.IsCSharp)); // add call to default OnCreated method @@ -284,9 +298,9 @@ protected static CodeStatement GeneratePropertySetterValidation(string propertyN new CodeMethodInvokeExpression( new CodeThisReferenceExpression(), "ValidateProperty", - new CodeExpression[] + new CodeExpression[] { - new CodePrimitiveExpression(propertyName), + new CodePrimitiveExpression(propertyName), new CodePropertySetValueReferenceExpression() })); } @@ -420,9 +434,9 @@ protected virtual void GenerateProperty(PropertyDescriptor propertyDescriptor) } // Here we check for database generated fields. In that case we strip any RequiredAttribute from the property. - if (propertyAttributes.Any(a=>a.GetType().Name == "DatabaseGeneratedAttribute")) + if (propertyAttributes.Any(a => a.GetType().Name == "DatabaseGeneratedAttribute")) { - propertyAttributes.RemoveAll(attr => attr.GetType() == typeof (RequiredAttribute)); + propertyAttributes.RemoveAll(attr => attr.GetType() == typeof(RequiredAttribute)); } // Here, we check for the presence of a complex type. If it exists we need to add a DisplayAttribute @@ -520,7 +534,7 @@ protected virtual void ValidateTypeAttributes(AttributeCollection typeAttributes private IEnumerable FilterTypeAttributes(AttributeCollection typeAttributes) { List filteredAttributes = new List(); - + // Ignore DefaultMemberAttribute if it has been put for an indexer IEnumerable defaultMemberAttribs = typeAttributes.Cast().Where(a => a.GetType() == typeof(DefaultMemberAttribute)); if (defaultMemberAttribs.Any()) @@ -535,9 +549,8 @@ private IEnumerable FilterTypeAttributes(AttributeCollection typeAttr } } - // Filter out attributes in filteredAttributes as well as DataContractAttribute and KnownTypeAttribute (since they are already handled) - return typeAttributes.Cast().Where(a => a.GetType() != typeof(DataContractAttribute) && a.GetType() != typeof(KnownTypeAttribute) && - !(filteredAttributes.Contains(a))); + // Filter out attributes in filteredAttributes and attributeTypesToFilter + return typeAttributes.Cast().Where(a => !_attributeTypesToFilter.Contains(a.GetType()) && !filteredAttributes.Contains(a)); } /// diff --git a/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj b/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj index b9b4e97df..40ee844b0 100644 --- a/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj +++ b/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj @@ -2,7 +2,7 @@ $(DefineConstants);SERVERFX;DBCONTEXT $(DefineConstants);HAS_LINQ2SQL - net472;net6.0 + net472;net6.0;net8.0 OpenRiaServices.Client.CodeGen OpenRiaServices Client Code Generator OpenRiaServices CodeGen provides the MsBuild Tasks to generate the client proxy. diff --git a/src/OpenRiaServices.Tools/Test/ClientCodeGenerationDispatcherTests.cs b/src/OpenRiaServices.Tools/Test/ClientCodeGenerationDispatcherTests.cs index b753ff958..0a069d7c8 100644 --- a/src/OpenRiaServices.Tools/Test/ClientCodeGenerationDispatcherTests.cs +++ b/src/OpenRiaServices.Tools/Test/ClientCodeGenerationDispatcherTests.cs @@ -1,7 +1,6 @@ extern alias TextTemplate; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.ComponentModel.DataAnnotations; using System.Globalization; using System.IO; @@ -12,6 +11,7 @@ using OpenRiaServices.Server.Test.Utilities; using OpenRiaServices.Tools.Test.T4Generator; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Mono.Cecil; namespace OpenRiaServices.Tools.Test { @@ -54,7 +54,7 @@ public void ClientCodeGenerationDispatcher_Finds_Custom() // into the MEF composition container using (ClientCodeGenerationDispatcher dispatcher = new ClientCodeGenerationDispatcher()) { - string[] compositionAssemblies = new string[] { Assembly.GetExecutingAssembly().Location}; + string[] compositionAssemblies = new string[] { Assembly.GetExecutingAssembly().Location }; IDomainServiceClientCodeGenerator generator = dispatcher.FindCodeGenerator(host, options, compositionAssemblies, MockCodeGenerator.GeneratorName); Assert.IsNotNull(generator, "the dispatcher did not find any code generator"); @@ -180,11 +180,11 @@ public void ClientCodeGenerationDispatcher_Error_Missing_Custom() IDomainServiceClientCodeGenerator generator = dispatcher.FindCodeGenerator(host, options, compositionAssemblies, "NotAGenerator"); Assert.IsNull(generator, "the dispatcher should not find any code generator"); - string error = string.Format(CultureInfo.CurrentCulture, - Resource.Code_Generator_Not_Found, - "NotAGenerator", - options.Language, - options.ServerProjectPath, + string error = string.Format(CultureInfo.CurrentCulture, + Resource.Code_Generator_Not_Found, + "NotAGenerator", + options.Language, + options.ServerProjectPath, options.ClientProjectPath, CodeDomClientCodeGenerator.GeneratorName); TestHelper.AssertContainsErrors(logger, error); @@ -479,11 +479,11 @@ public void ClientCodeGenerationDispatcher_Error_Multiple_Generators() string errorParam = " " + MockCodeGenerator.GeneratorName + Environment.NewLine + " " + T4DomainServiceClientCodeGenerator.GeneratorName + Environment.NewLine; - string error = (string.Format(CultureInfo.CurrentCulture, - Resource.Multiple_Custom_Code_Generators_Using_Default, - options.Language, - errorParam, - options.ClientProjectPath, + string error = (string.Format(CultureInfo.CurrentCulture, + Resource.Multiple_Custom_Code_Generators_Using_Default, + options.Language, + errorParam, + options.ClientProjectPath, MockCodeGenerator.GeneratorName, CodeDomClientCodeGenerator.GeneratorName)); TestHelper.AssertContainsWarnings(logger, error); @@ -518,19 +518,18 @@ public void ClientCodeGenerationDispatcher_Error_Multiple_Generators_Same_Name() string errorParam = " " + typeof(MockFSharpCodeGenerator1).FullName + Environment.NewLine + " " + typeof(MockFSharpCodeGenerator2).FullName + Environment.NewLine; - string error = string.Format(CultureInfo.CurrentCulture, - Resource.Multiple_Named_Code_Generators, + string error = string.Format(CultureInfo.CurrentCulture, + Resource.Multiple_Named_Code_Generators, generatorName, - options.Language, + options.Language, errorParam, - options.ServerProjectPath, + options.ServerProjectPath, options.ClientProjectPath, typeof(MockFSharpCodeGenerator1).AssemblyQualifiedName); TestHelper.AssertContainsErrors(logger, error); } } - [DeploymentItem("TypeLoadExceptionProject.dll")] [Description("ClientCodeGenerationDispatcher logs an warning and survives a TypeLoadException creating MEF")] [TestMethod] public void ClientCodeGenerationDispatcher_Error_TypeLoadException() @@ -553,7 +552,18 @@ public void ClientCodeGenerationDispatcher_Error_TypeLoadException() string unitTestAssemblyLocation = Assembly.GetExecutingAssembly().Location; string typeLoadExceptionProjectLocation = Path.Combine(Path.GetDirectoryName(unitTestAssemblyLocation), "TypeLoadExceptionProject.dll"); - Assert.IsTrue(File.Exists(typeLoadExceptionProjectLocation), "Expected TypeLoadExceptionProject.dll to coreside with this assembly in test folder"); + if (!File.Exists(typeLoadExceptionProjectLocation)) + { + var assemblyNameDefinition = new AssemblyNameDefinition("TestAssemblyNameDefinition", new Version(0, 0, 0, 0)); + using var newAssembly = AssemblyDefinition.CreateAssembly(assemblyNameDefinition, "TestModuleName", ModuleKind.Dll); + var modules = newAssembly.MainModule; + var class1 = new TypeDefinition("TestNamespace", "Class1", Mono.Cecil.TypeAttributes.Class); + var class2 = new TypeDefinition("TestNamespace", "Class2", Mono.Cecil.TypeAttributes.Class, class1); + class1.BaseType = class2; + modules.Types.Add(class1); + modules.Types.Add(class2); + newAssembly.Write(typeLoadExceptionProjectLocation); + } // Do what MEF does to load the types so we can capture the exception Exception expectedException = null; @@ -657,7 +667,7 @@ public string GenerateCode(ICodeGenerationHost host, IEnumerable f.StartsWith("net4", StringComparison.Ordinal)); +#elif NET6_0 + string framework = frameworks.First(f => f.StartsWith("net6", StringComparison.Ordinal)); #else string framework = frameworks.First(f => !f.StartsWith("net4", StringComparison.Ordinal)); #endif diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index a4ba5785a..1e356ea82 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -2,7 +2,7 @@ false 618 - net472;net6.0 + net472;net6.0;net8.0 true true $(DefineConstants);HAS_LINQ2SQL @@ -28,6 +28,7 @@ + @@ -58,7 +59,6 @@ - diff --git a/src/RiaServices.sln b/src/RiaServices.sln index 10f1e0372..8b806a39a 100644 --- a/src/RiaServices.sln +++ b/src/RiaServices.sln @@ -73,8 +73,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaServices.Hosting.Wcf EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "T4ClientCodeGenerator", "OpenRiaServices.Tools\Test\T4DomainServiceCodeGenerator\T4ClientCodeGenerator.csproj", "{5F7848F4-EA6E-49B3-A5DE-65A1FB440C88}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypeLoadExceptionProject", "Test\Desktop\TypeLoadExceptionProject\TypeLoadExceptionProject.csproj", "{2265A098-F256-418D-9D11-9FD6561E8D42}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaServices.Tools.TextTemplate", "OpenRiaServices.Tools.TextTemplate\Framework\OpenRiaServices.Tools.TextTemplate.csproj", "{1D3AE529-961A-47FD-834B-7893FE6FF479}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaServices.Tools.TextTemplate.Test", "OpenRiaServices.Tools.TextTemplate\Test\OpenRiaServices.Tools.TextTemplate.Test.csproj", "{5DD0AD3D-8FD7-4FDA-8F00-45108C0DF332}" @@ -255,10 +253,6 @@ Global {5F7848F4-EA6E-49B3-A5DE-65A1FB440C88}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F7848F4-EA6E-49B3-A5DE-65A1FB440C88}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F7848F4-EA6E-49B3-A5DE-65A1FB440C88}.Release|Any CPU.Build.0 = Release|Any CPU - {2265A098-F256-418D-9D11-9FD6561E8D42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2265A098-F256-418D-9D11-9FD6561E8D42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2265A098-F256-418D-9D11-9FD6561E8D42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2265A098-F256-418D-9D11-9FD6561E8D42}.Release|Any CPU.Build.0 = Release|Any CPU {1D3AE529-961A-47FD-834B-7893FE6FF479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D3AE529-961A-47FD-834B-7893FE6FF479}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D3AE529-961A-47FD-834B-7893FE6FF479}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -415,7 +409,6 @@ Global {FB928CDD-D223-4921-B97D-EB16EEE7D2AA} = {BB0E26DD-14D3-4CD5-8F2B-B5C1CA281719} {82539B51-6BB5-4C04-B37D-4FA850E397CF} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {5F7848F4-EA6E-49B3-A5DE-65A1FB440C88} = {6B0A9D52-33D8-4E62-A3E3-3AF7C26EFA30} - {2265A098-F256-418D-9D11-9FD6561E8D42} = {E8CAC11B-50B6-4243-A12A-D831EBB064CB} {1D3AE529-961A-47FD-834B-7893FE6FF479} = {96D29745-0D96-4959-AB96-8FBEDC8AB485} {5DD0AD3D-8FD7-4FDA-8F00-45108C0DF332} = {6B0A9D52-33D8-4E62-A3E3-3AF7C26EFA30} {72137DB5-8A91-4FF8-A292-5F6E73A66CD6} = {2095B11C-903C-47FF-B812-82DFA7A068AC} diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/OpenRiaServices.Common.DomainServices.Test.csproj b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/OpenRiaServices.Common.DomainServices.Test.csproj index f10ce4226..27c5f0416 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/OpenRiaServices.Common.DomainServices.Test.csproj +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/OpenRiaServices.Common.DomainServices.Test.csproj @@ -4,7 +4,7 @@ net472;net6.0 pdbonly - $(NoWarn);CS0618 + $(NoWarn);CS0618 $(DefineConstants);WCF;HAS_LINQ2SQL $(DefineConstants);ASPNET_CORE diff --git a/src/Test/Desktop/TypeLoadExceptionProject/Class1.cs b/src/Test/Desktop/TypeLoadExceptionProject/Class1.cs deleted file mode 100644 index 2a7ce716d..000000000 --- a/src/Test/Desktop/TypeLoadExceptionProject/Class1.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace TypeLoadExceptionProject -{ - // This test project exists for one reason only, to force - // a load exception when it is loaded. It is used where - // we want to test recovery from this situation -#pragma warning disable 0824 - public class Class1 - { - extern static Class1(); - public static void Main() { return; } - } -#pragma warning restore 0824 -} diff --git a/src/Test/Desktop/TypeLoadExceptionProject/Properties/AssemblyInfo.cs b/src/Test/Desktop/TypeLoadExceptionProject/Properties/AssemblyInfo.cs deleted file mode 100644 index 6f1c52e62..000000000 --- a/src/Test/Desktop/TypeLoadExceptionProject/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TypeLoadExceptionProject")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Outercurve Foundation")] -[assembly: AssemblyProduct("TypeLoadExceptionProject")] -[assembly: AssemblyCopyright("© Outercurve Foundation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2010f752-3383-4d21-a3e8-52b247c359f8")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Test/Desktop/TypeLoadExceptionProject/TypeLoadExceptionProject.csproj b/src/Test/Desktop/TypeLoadExceptionProject/TypeLoadExceptionProject.csproj deleted file mode 100644 index ac6a3ee8b..000000000 --- a/src/Test/Desktop/TypeLoadExceptionProject/TypeLoadExceptionProject.csproj +++ /dev/null @@ -1,6 +0,0 @@ - - - false - net472;net6.0 - - \ No newline at end of file