Merge remote-tracking branch 'upstream/main' into spanify_dynamicquer…

…yable
OpenRIAServices · Feb 8, 2024 · 0b8a1da · 0b8a1da
2 parents 72b04fc + 069a03f
commit 0b8a1da
Show file tree

Hide file tree

Showing 30 changed files with 222 additions and 274 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -5,6 +5,9 @@
 * Update nuget dependencies and add new dependencies to OpenRiaServices.Hosting.Wcf
   * `System.Collections.Immutable` and `System.Memory` are new dependencies of Wcf hosting
 
+* .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/NuGet/OpenRiaServices.OData/OpenRiaServices.OData.nuspec b/NuGet/OpenRiaServices.OData/OpenRiaServices.OData.nuspec
diff --git a/NuGet/OpenRiaServices.OData/content/web.config.transform b/NuGet/OpenRiaServices.OData/content/web.config.transform
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -129,7 +129,7 @@ steps:
     versionEnvVar: Build.BuildNumber
     packDestination: '$(Build.ArtifactStagingDirectory)' 
   continueOnError: true
-  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+#  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
 - task: CopyFiles@2
   displayName: 'Copy VS Extension: $(build.artifactstagingdirectory)'

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -51,13 +51,7 @@
     <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == '' And '$(IsTestProject)' == 'true'">$(MSBuildThisFileDirectory)\snk\Tests.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
 
-    <!-- opt out from portable pdbs, for better compability with older net framework releases
-    This is required for several test related projects since code generation's 
-    pdb reader cannot read the portable ones
-    -->
     <DebugType>portable</DebugType>
-    <DebugType Condition="$(TargetFramework.StartsWith('net4')) OR '$(IsTestProject)'=='true'">pdbonly</DebugType>
-
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GitVersion_AssemblySemVer)' != ''">

diff --git a/src/OpenRiaServices.Client/Framework/Entity.cs b/src/OpenRiaServices.Client/Framework/Entity.cs
@@ -250,8 +250,8 @@ private set
                     EntitySet entitySet = this.LastSet;
                     if (entitySet != null)
                     {
-                        bool isInteresting = this._entityState != EntityState.Unmodified
-                            && this._entityState != EntityState.Detached;
+                        bool isInteresting = this._entityState is not EntityState.Unmodified
+                            and not EntityState.Detached;
                         entitySet.TrackAsInteresting(this, isInteresting);
                     }
 
@@ -302,12 +302,9 @@ internal void OnChildUpdate()
                 }
             }
 
-            if (this.EntitySet != null)
-            {
-                // when a child has been changed in any way, the parent becomes
-                // interesting
-                this.EntitySet.TrackAsInteresting(this, true);
-            }
+            // when a child has been changed in any way, the parent becomes
+            // interesting
+            this.EntitySet?.TrackAsInteresting(this, true);
         }
 
         /// <summary>
@@ -526,8 +523,7 @@ private set
                 this._isMerging = value;
                 foreach (MetaMember metaMember in MetaType.DataMembers.Where(f => f.IsComplex && !f.IsCollection))
                 {
-                    ComplexObject propertyValue = metaMember.GetValue(this) as ComplexObject;
-                    if (propertyValue != null)
+                    if (metaMember.GetValue(this) is ComplexObject propertyValue)
                     {
                         propertyValue.IsMergingState = this._isMerging;
                     }
@@ -647,10 +643,7 @@ internal void Reset()
             this._editSession = null;
             this._trackChanges = false;
             UndoAllEntityActions(throwIfSubmitting: true);
-            if (this._validationErrors != null)
-            {
-                this._validationErrors.Clear();
-            }
+            this._validationErrors?.Clear();
             this.EntityConflict = null;
             this.EntitySet = null;
             this._lastSet = null;
@@ -682,8 +675,8 @@ internal void StopTracking()
         /// </summary>
         protected void AcceptChanges()
         {
-            if (this.EntityState == EntityState.Unmodified ||
-                this.EntityState == EntityState.Detached)
+            if (this.EntityState is EntityState.Unmodified or
+                EntityState.Detached)
             {
                 // if we're detached or have no changes, noop after
                 // closing any in progress edit session
@@ -696,11 +689,7 @@ protected void AcceptChanges()
             // Accept any child changes. Note, we must accept child changes before setting our own
             // state to Unmodified. This avoids a situation where we get notifications from child
             // entities that cause our state to flip back to Modified.
-            if (entitySet != null)
-            {
-                // accept any child changes
-                entitySet.EntityContainer.CompleteChildChanges(this, true);
-            }
+            entitySet?.EntityContainer.CompleteChildChanges(this, true);
 
             if (this.EntityState == EntityState.New)
             {
@@ -730,30 +719,21 @@ protected void AcceptChanges()
             else if (this.EntityState == EntityState.Deleted)
             {
                 this.StopTracking();
-                if (entitySet != null)
-                {
-                    entitySet.RemoveFromCache(this);
-                }
+                entitySet?.RemoveFromCache(this);
                 // move back to the default state
                 this.EntityState = EntityState.Detached;
             }
 
-            if (entitySet != null)
-            {
-                // remove from the interesting entities set
-                entitySet.TrackAsInteresting(this, false);
-            }
+            // remove from the interesting entities set
+            entitySet?.TrackAsInteresting(this, false);
 
             // need to end any in progress edit session
             this._editSession = null;
 
             // clear all custom method invocations
             this.UndoAllEntityActions(throwIfSubmitting: false);
 
-            if (this._validationErrors != null)
-            {
-                this._validationErrors.Clear();
-            }
+            this._validationErrors?.Clear();
             this.EntityConflict = null;
             this.IsInferred = false;
             this._hasChildChanges = false;
@@ -769,8 +749,8 @@ protected void AcceptChanges()
         /// </summary>
         protected void RejectChanges()
         {
-            if (this.EntityState == EntityState.Unmodified ||
-                this.EntityState == EntityState.Detached)
+            if (this.EntityState is EntityState.Unmodified or
+                EntityState.Detached)
             {
                 // if we're detached or have no changes, noop after
                 // closing any in progress edit session
@@ -783,10 +763,7 @@ protected void RejectChanges()
             // Reject any child changes. Note, we must reject child changes before setting our own
             // state to Unmodified. This avoids a situation where we get notifications from child
             // entities that cause our state to flip back to Modified.
-            if (entitySet != null)
-            {
-                entitySet.EntityContainer.CompleteChildChanges(this, false);
-            }
+            entitySet?.EntityContainer.CompleteChildChanges(this, false);
 
             if (this._entityState == EntityState.Modified || this.Parent != null)
             {
@@ -830,10 +807,7 @@ protected void RejectChanges()
             UndoAllEntityActions();
 
             // Empty out the error collections
-            if (this._validationErrors != null)
-            {
-                this._validationErrors.Clear();
-            }
+            this._validationErrors?.Clear();
             this.EntityConflict = null;
             this._hasChildChanges = false;
             Debug.Assert(!this.HasChanges, "Entity.HasChanges should be false");
@@ -1845,7 +1819,7 @@ private EditSession(Entity entity)
             {
                 this._entity = entity;
                 this._lastState = entity.EntityState;
-                this._customMethodInvocations = entity._customMethodInvocations != null ? entity._customMethodInvocations.ToArray() : null;
+                this._customMethodInvocations = entity._customMethodInvocations?.ToArray();
                 this._validationErrors = entity.ValidationErrors.ToArray();
                 this._modifiedProperties = new List<string>();
             }