diff --git a/Changelog.md b/Changelog.md index 97beec4d7..ea1af6a14 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ # Unreleased +* .NET Framework builds now includes the smaller portable pdb's instead of of the old "full" windows style pdb's + * NOTE: For .NET Framework apps ensure that *supportedRuntime* in *app.config* and corresponding setting in *web.config* does not specify an older runtime if you wan't line numbers in stack traces. + # 5.4.2 / AspNetCore 1.0.0 ### .NET8 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f28f730cf..5a0ff3fad 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -51,13 +51,7 @@ $(MSBuildThisFileDirectory)\snk\Tests.snk true - portable - pdbonly - diff --git a/src/OpenRiaServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj b/src/OpenRiaServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj index 4095421ae..9596a371c 100644 --- a/src/OpenRiaServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj +++ b/src/OpenRiaServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj @@ -7,10 +7,6 @@ $(DefineConstants);DBCONTEXT 1.0.0.0 - - - - diff --git a/src/OpenRiaServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj b/src/OpenRiaServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj index 2cd471e5c..260a4989e 100644 --- a/src/OpenRiaServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj +++ b/src/OpenRiaServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj @@ -6,10 +6,6 @@ net472;net6.0 1.0.0.0 - - - - diff --git a/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj b/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj index 0bc27b36e..23c1fafaf 100644 --- a/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj +++ b/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj @@ -2,10 +2,6 @@ net472 - - - - diff --git a/src/OpenRiaServices.Tools/Test/NotificationMethodGeneratorTest.cs b/src/OpenRiaServices.Tools/Test/NotificationMethodGeneratorTest.cs index c03d4c5c5..eac8dd897 100644 --- a/src/OpenRiaServices.Tools/Test/NotificationMethodGeneratorTest.cs +++ b/src/OpenRiaServices.Tools/Test/NotificationMethodGeneratorTest.cs @@ -2,7 +2,6 @@ using System.CodeDom; using System.Collections.Generic; using OpenRiaServices.Server; -using OpenRiaServices.Server.Test.Utilities; using System.Xml; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -41,7 +40,7 @@ public static IEnumerable PartialMethodsSnippetBlockTestCases DynamicData(nameof(PartialMethodsSnippetBlockTestCases))] public void PartialMethodsSnippetBlockTest(string comments, string baseMethodNames, string parameters) { - string[] baseMethodNamesArray = baseMethodNames.Split(new char[] { ',' }); + string[] baseMethodNamesArray = baseMethodNames.Split(','); PartialMethodsSnippetBlockTest(true, comments, baseMethodNamesArray, parameters); PartialMethodsSnippetBlockTest(false, comments, baseMethodNamesArray, parameters); @@ -82,7 +81,7 @@ public void PartialMethodsSnippetBlockTest(bool isCSharp, string comments, strin } snippetstr += snippet.Text; } - Assert.AreEqual(snippetstr.Replace("\r\n", "").TrimEnd(), XmlReader.Value.Replace("\n", "")); + Assert.AreEqual(XmlReader.Value.Replace("\n", ""), snippetstr.Replace("\r\n", "").TrimEnd()); } [TestMethod] @@ -96,7 +95,7 @@ public void OnCreatedMethodInvokeExpressionTest(bool isCSharp) { NotificationMethodGenerator target = new NotificationMethodGenerator(CreateProxyGenerator(isCSharp)); - Assert.AreEqual(target.OnCreatedMethodInvokeExpression.Method.MethodName, "OnCreated"); + Assert.AreEqual("OnCreated", target.OnCreatedMethodInvokeExpression.Method.MethodName); } public static IEnumerable OnCreatedMethodInvokeExpressionTestCases @@ -108,7 +107,7 @@ public static IEnumerable OnCreatedMethodInvokeExpressionTestCases ] public void GetMethodInvokeExpressionStatementForTest(string comments, string baseMethodNames, string parameters) { - string[] baseMethodNamesArray = baseMethodNames.Split(new char[] { ',' }); + string[] baseMethodNamesArray = baseMethodNames.Split(','); GetMethodInvokeExpressionStatementForTest(true, comments, baseMethodNamesArray, parameters); GetMethodInvokeExpressionStatementForTest(false, comments, baseMethodNamesArray, parameters); @@ -128,14 +127,14 @@ public void GetMethodInvokeExpressionStatementForTest(bool isCSharp, string comm target.AddMethodFor(baseMethodName, expressions, comments); CodeExpressionStatement actual = target.GetMethodInvokeExpressionStatementFor(baseMethodName); - CodeMethodInvokeExpression actualExpression = actual.Expression as CodeMethodInvokeExpression; + CodeMethodInvokeExpression actualExpression = (CodeMethodInvokeExpression)actual.Expression; - Assert.AreEqual(actualExpression.Method.MethodName, "On" + baseMethodName); + Assert.AreEqual("On" + baseMethodName, actualExpression.Method.MethodName); for (int idx = 0; idx < parameters.Length; idx++) { string paramName = ((CodeArgumentReferenceExpression)actualExpression.Parameters[idx]).ParameterName; - Assert.AreEqual(paramName, parameters[idx].Name); + Assert.AreEqual(parameters[idx].Name, paramName); } } } @@ -188,7 +187,7 @@ public void AddMethodFor2Test(bool isCSharp, string comments, string paramDeclAr } else if (paramDeclArgs != "null") { - string[] args = paramDeclArgs.Split(new char[] { ',' }); + string[] args = paramDeclArgs.Split(','); parameterDeclaration = new CodeParameterDeclarationExpression(args[0], args[1]); } @@ -251,13 +250,13 @@ private static CodeParameterDeclarationExpressionCollection GetCodeParameterDecl { parameters = new CodeParameterDeclarationExpressionCollection(); - string[] paramDecls = paramDeclsArgs.Split(new char[] { ';' }); + string[] paramDecls = paramDeclsArgs.Split(';'); foreach (string paramDecl in paramDecls) { if (paramDecl != "") { - string[] args = paramDecl.Split(new char[] { ',' }); - Assert.AreEqual(args.Length, 2, "Params definition file not in the correct format!"); + string[] args = paramDecl.Split(','); + Assert.AreEqual(2, args.Length, "Params definition file not in the correct format!"); CodeParameterDeclarationExpression codeParam = new CodeParameterDeclarationExpression(args[0], args[1]); parameters.Add(codeParam); }