Optimise conditional compiles & package dependencies

ServiceStack.Aws/src/ServiceStack.Aws/DynamoDb/QueryExpression.cs

@@ -69,7 +69,7 @@ public QueryExpression<T> Clone()
             ScanIndexForward = ScanIndexForward,                                
         }.SetSelect(base.Select);
 
-#if !NETCORE
+#if NETFRAMEWORK
             if (ReadWriteTimeoutInternal != null)
                 q.ReadWriteTimeoutInternal = ReadWriteTimeoutInternal;
             if (TimeoutInternal != null)

ServiceStack.Aws/src/ServiceStack.Aws/DynamoDb/ScanExpression.cs

@@ -68,7 +68,7 @@ public ScanExpression<T> Clone()
             TotalSegments = TotalSegments,                
         }.SetSelect(base.Select);
 
-#if !NETCORE
+#if NETFRAMEWORK
             if (ReadWriteTimeoutInternal != null)
                 q.ReadWriteTimeoutInternal = ReadWriteTimeoutInternal;
             if (TimeoutInternal != null)

ServiceStack.Aws/src/ServiceStack.Aws/Sqs/SqsMqWorker.cs

@@ -123,7 +123,7 @@ private void Run()
                     StartPolling();
                 }
             }
-#if !NETCORE            
+#if NETFRAMEWORK            
             catch(ThreadInterruptedException)
             {   // Expected exceptions from Kill()
                 log.Warn($"Received ThreadInterruptedException in Worker: {QueueName}");

ServiceStack.Aws/src/ServiceStack.Aws/Support/NetCoreAwsExtensions.cs

@@ -1,4 +1,4 @@
-#if NETCORE
+#if !NETFRAMEWORK
 
 using System;
 using System.Collections.Generic;

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/QueueClientExtensions.cs

@@ -9,7 +9,7 @@ namespace ServiceStack.Azure.Messaging;
 public static class QueueClientExtensions
 {
 
-#if NETCORE
+#if !NETFRAMEWORK
     static readonly PropertyInfo InnerReceiverProperty =
         typeof(Microsoft.Azure.ServiceBus.QueueClient).GetProperties(BindingFlags.NonPublic | BindingFlags.Instance).First(x => x.Name == "InnerReceiver");
 

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/ServiceBusMqClient.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-#if NETCORE
+#if !NETFRAMEWORK
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Core;
 #else
@@ -42,7 +42,7 @@ public void Ack(IMessage? message)
         var sbClient = parentFactory.GetOrCreateClient(queueName);
         try
         {
-#if NETCORE
+#if !NETFRAMEWORK
             sbClient.CompleteAsync(lockToken).GetAwaiter().GetResult();
 #else
             sbClient.Complete(Guid.Parse(lockToken));
@@ -59,7 +59,7 @@ public void Ack(IMessage? message)
         if (mqResponse is IMessage)
             return (IMessage<T>)mqResponse;
 
-#if NETCORE
+#if !NETFRAMEWORK
         if (mqResponse is not Microsoft.Azure.ServiceBus.Message msg)
             return null;
         var msgBody = msg.Body.FromMessageBody();
@@ -85,7 +85,7 @@ public IMessage<T> Get<T>(string queueName, TimeSpan? timeout = default)
         var sbClient = parentFactory.GetOrCreateClient(queueName);
         string? lockToken = null;
 
-#if NETCORE
+#if !NETFRAMEWORK
         var msg = Task.Run(() => sbClient.ReceiveAsync(timeout)).GetAwaiter().GetResult();
         if (msg != null)
             lockToken = msg.SystemProperties.LockToken;
@@ -110,7 +110,7 @@ public IMessage<T> Get<T>(string queueName, TimeSpan? timeout = default)
         return iMessage;
     }
 
-#if NETCORE
+#if !NETFRAMEWORK
     private async Task<Microsoft.Azure.ServiceBus.Message> GetMessageFromReceiver(MessageReceiver messageReceiver, TimeSpan? timeout)
     {
         var msg = timeout.HasValue

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/ServiceBusMqMessageFactory.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using ServiceStack.Text;
 
-#if NETCORE
+#if !NETFRAMEWORK
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Management;
 #else
@@ -20,21 +20,22 @@ namespace ServiceStack.Azure.Messaging;
 
 public class ServiceBusMqMessageFactory : IMessageFactory
 {
+
     private long timesStarted;
     private long doOperation = WorkerOperation.NoOp;
     private long noOfErrors = 0;
     private int noOfContinuousErrors = 0;
     private string lastExMsg = null;
 
-#if NETCORE
+#if !NETFRAMEWORK
     public Action<Microsoft.Azure.ServiceBus.Message,IMessage> PublishMessageFilter { get; set; }
 #else
     public Action<BrokeredMessage,IMessage> PublishMessageFilter { get; set; }
 #endif
 
 
     protected internal readonly string address;
-#if !NETCORE
+#if NETFRAMEWORK
     protected internal readonly NamespaceManager namespaceManager;
 #else
     protected internal readonly ManagementClient managementClient;
@@ -52,7 +53,7 @@ public ServiceBusMqMessageFactory(ServiceBusMqServer mqServer, string address)
     {
         this.MqServer = mqServer;
         this.address = address;
-#if !NETCORE
+#if NETFRAMEWORK
         this.namespaceManager = NamespaceManager.CreateFromConnectionString(address);
 #else
         this.managementClient = new ManagementClient(address);
@@ -103,7 +104,7 @@ protected internal void StartQueues(Dictionary<Type, IMessageHandlerFactory> han
                     queueMap.Add(queueName, type);
 
                 var mqDesc = new QueueDescription(queueName);
-#if !NETCORE
+#if NETFRAMEWORK
                 if (!namespaceManager.QueueExists(queueName))
                     namespaceManager.CreateQueue(mqDesc);
 #else
@@ -127,7 +128,7 @@ private void AddQueueHandler(Type queueType, string queueName, int threadCount=1
     {
         queueName = queueName.SafeQueueName()!;
 
-#if NETCORE
+#if !NETFRAMEWORK
         var sbClient = new QueueClient(address, queueName, ReceiveMode.PeekLock);
         var messageHandler = this.GetMessageHandler(queueType);
         var sbWorker = new ServiceBusMqWorker(messageHandler, CreateMessageQueueClient(), queueName, sbClient);
@@ -162,7 +163,7 @@ private void AddQueueHandler(Type queueType, string queueName, int threadCount=1
     protected internal void StopQueues()
     {
         this.status = WorkerStatus.Stopping;
-#if NETCORE
+#if !NETFRAMEWORK
         sbClients.Each(async kvp => await kvp.Value.CloseAsync());
 #else
         sbClients.Each(kvp => kvp.Value.Close());
@@ -180,7 +181,7 @@ protected internal QueueClient GetOrCreateClient(string queueName)
 
         var qd = new QueueDescription(queueName);
 
-#if !NETCORE
+#if NETFRAMEWORK
         // Create queue on ServiceBus namespace if it doesn't exist
         if (!namespaceManager.QueueExists(queueName))
         {

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/ServiceBusMqMessageProducer.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ServiceStack.Messaging;
 using ServiceStack.Text;
-#if NETCORE
+#if !NETFRAMEWORK
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Core;
 #else
@@ -16,7 +16,7 @@ public class ServiceBusMqMessageProducer : IMessageProducer
     private readonly Dictionary<string, MessageReceiver> sbReceivers = new();
     protected readonly ServiceBusMqMessageFactory? parentFactory;
 
-#if NETCORE
+#if !NETFRAMEWORK
     public Action<Microsoft.Azure.ServiceBus.Message,IMessage> PublishMessageFilter { get; set; }
 #else
     public Action<BrokeredMessage,IMessage> PublishMessageFilter { get; set; }
@@ -65,7 +65,7 @@ public virtual void Publish(string queueName, IMessage message)
         using (JsConfig.With(new Text.Config { IncludeTypeInfo = true }))
         {
             var msgBody = JsonSerializer.SerializeToString(message, typeof(IMessage));
-#if NETCORE
+#if !NETFRAMEWORK
             var msg = new Microsoft.Azure.ServiceBus.Message
             {
                 Body = msgBody.ToUtf8Bytes(),
@@ -80,7 +80,7 @@ public virtual void Publish(string queueName, IMessage message)
         }
     }
 
-#if NETCORE
+#if !NETFRAMEWORK
     public Microsoft.Azure.ServiceBus.Message ApplyFilter(Microsoft.Azure.ServiceBus.Message azureMessage, IMessage message)
     {
         PublishMessageFilter?.Invoke(azureMessage, message);
@@ -94,7 +94,7 @@ public BrokeredMessage ApplyFilter(BrokeredMessage azureMessage, IMessage messag
     }
 #endif
 
-#if NETCORE
+#if !NETFRAMEWORK
     protected MessageReceiver GetOrCreateMessageReceiver(string queueName)
     {
         queueName = queueName.SafeQueueName()!;

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/ServiceBusMqServer.cs

@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Text;
-#if NETCORE
+#if !NETFRAMEWORK
 using Microsoft.Azure.ServiceBus.Management;
 #else
 using Microsoft.ServiceBus;
@@ -51,7 +51,7 @@ public ServiceBusMqServer(string connectionString)
     public Func<object, object> ResponseFilter { get; set; }
 
 
-#if NETCORE
+#if !NETFRAMEWORK
     /// <summary>
     /// Exposes the <see cref="Microsoft.Azure.ServiceBus.Management.ManagementClient"/> which can be used to perform
     /// management operations on ServiceBus entities.
@@ -104,7 +104,7 @@ public bool DisablePublishingToOutq
     public bool DisableNotifyMessages { get; set; }
 
 
-#if NETCORE
+#if !NETFRAMEWORK
     public Action<Microsoft.Azure.ServiceBus.Message,IMessage> PublishMessageFilter 
     {
         get => messageFactory!.PublishMessageFilter;

ServiceStack.Azure/src/ServiceStack.Azure/Messaging/ServiceBusMqWorker.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-#if NETCORE
+#if !NETFRAMEWORK
 using Microsoft.Azure.ServiceBus;
 #else
 using Microsoft.ServiceBus.Messaging;
@@ -38,7 +38,7 @@ public ServiceBusMqWorker(IMessageHandler messageHandler,
 
     public IMessageHandlerStats GetStats() => MessageHandler.GetStats();
 
-#if NETCORE
+#if !NETFRAMEWORK
     public Task HandleMessageAsync(Microsoft.Azure.ServiceBus.Message msg, CancellationToken token)
     {
         var strMessage = msg.Body.FromMessageBody();

ServiceStack.Azure/src/ServiceStack.Azure/Storage/CloudBlobContainerExtension.cs

@@ -14,7 +14,7 @@ namespace ServiceStack.Azure.Storage;
 
 public static class CloudBlobContainerExtension
 {
-#if NETCORE
+#if !NETFRAMEWORK
     public static IEnumerable<IListBlobItem> ListBlobs(this CloudBlobContainer container, string? prefix = null,
         bool useFlatBlobListing = false)
     {

ServiceStack.OrmLite/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -82,7 +82,7 @@ public PostgreSqlDialectProvider()
             RegisterConverter<DateOnly>(new PostgreSqlDateOnlyConverter());
 #endif
 
-#if NET472
+#if NETFRAMEWORK
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 #endif
 

ServiceStack.OrmLite/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

@@ -14,7 +14,7 @@
 using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.SqlServer.Converters;
 using ServiceStack.Text;
-#if NETCORE
+#if !NETFRAMEWORK
 using ApplicationException = System.InvalidOperationException;
 #endif
 

ServiceStack.OrmLite/src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs

@@ -120,7 +120,7 @@ public override object FromDbValue(Type fieldType, object value)
 
             if (DateStyle == DateTimeKind.Utc)
             {
-#if NETCORE
+#if !NETFRAMEWORK
                 //.NET Core returns correct Local time but as Unspecified so change to Local and Convert to UTC
                 dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Local).ToUniversalTime();
 #else

ServiceStack.OrmLite/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs

@@ -29,7 +29,7 @@ protected SqliteOrmLiteDialectProviderBase()
         base.RegisterConverter<Guid>(new SqliteGuidConverter());
         base.RegisterConverter<bool>(new SqliteBoolConverter());
         base.RegisterConverter<byte[]>(new SqliteByteArrayConverter());
-#if NETCORE            
+#if !NETFRAMEWORK            
             base.RegisterConverter<char>(new SqliteCharConverter());
 #endif
         this.Variables = new Dictionary<string, string>

ServiceStack.OrmLite/src/ServiceStack.OrmLite/Converters/SpecialConverters.cs

@@ -6,7 +6,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using ServiceStack.DataAnnotations;
-#if NETCORE
+#if !NETFRAMEWORK
 using System.Globalization;
 #endif
 

ServiceStack.OrmLite/src/ServiceStack.OrmLite/OrmLiteConfig.cs

@@ -186,7 +186,7 @@ public static void ResetLogFactory(ILogFactory logFactory=null)
 
         public static bool DisableColumnGuessFallback { get; set; }
         public static bool StripUpperInLike { get; set; } 
-#if NETCORE
+#if !NETFRAMEWORK
             = true;
 #endif
 

ServiceStack.OrmLite/src/ServiceStack.OrmLite/OrmLiteContext.cs

@@ -3,7 +3,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
-#if !NETCORE
+#if NETFRAMEWORK
 using System.Runtime.Remoting.Messaging;
 #endif
 using System.Threading;
@@ -23,7 +23,7 @@ public class OrmLiteContext
         [ThreadStatic]
         public static IDictionary ContextItems;
 
-#if NETCORE
+#if !NETFRAMEWORK
         AsyncLocal<IDictionary> localContextItems = new();
 #endif
 
@@ -40,7 +40,7 @@ public virtual IDictionary Items
 
         private IDictionary GetItems()
         {
-#if NETCORE
+#if !NETFRAMEWORK
             if (UseThreadStatic)
                 return ContextItems;
 
@@ -63,7 +63,7 @@ private IDictionary GetItems()
 
         private IDictionary CreateItems(IDictionary items = null)
         {
-#if NETCORE
+#if !NETFRAMEWORK
                 if (UseThreadStatic)
                 {
                     ContextItems = items ??= new Dictionary<object, object>();
@@ -101,7 +101,7 @@ public void ClearItems()
             }
             else
             {
-#if NETCORE
+#if !NETFRAMEWORK
                 localContextItems.Value = new ConcurrentDictionary<object, object>();                
 #else                
                 CallContext.FreeNamedDataSlot(_key);

ServiceStack.OrmLite/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj

@@ -45,13 +45,6 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
-    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

ServiceStack.OrmLite/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj

@@ -52,13 +52,6 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
-    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
 </Project>