فهرست منبع

Fast reports ditching framework dependence

Kenric Nugteren 1 سال پیش
والد
کامیت
e952c9c301

+ 1 - 1
fastreports.wpf/FastReport.Compat/FastReport.Compat.WPF/FastReport.Compat.WPF.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <UseWindowsForms>false</UseWindowsForms>
     <AssemblyName>FastReport.Compat</AssemblyName>

+ 2 - 2
fastreports.wpf/FastReport.DataVisualization/FastReport.DataVisualization.WPF/FastReport.DataVisualization.WPF.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>false</UseWindowsForms>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <AssemblyName>FastReport.DataVisualization</AssemblyName>
@@ -25,7 +25,7 @@
     <ProjectReference Include="$(FastReportFormsWPFProj)">
       <PrivateAssets>compile</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="$(FastReportCompatWPFProj)"/>
+    <ProjectReference Include="$(FastReportCompatWPFProj)" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
fastreports.wpf/FastReport.Forms.WPF/FastReport.Forms.WPF.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWpf>true</UseWpf>
     <LangVersion>latest</LangVersion>

+ 2 - 2
roslynpad/src/RoslynPad.Editor.Shared/AvalonEditTextContainer.cs

@@ -63,7 +63,7 @@ namespace RoslynPad.Editor
 
             var textSpan = new TextSpan(e.Offset, e.RemovalLength);
             var textChangeRange = new TextChangeRange(textSpan, e.InsertionLength);
-            _currentText = _currentText.WithChanges(new TextChange(textSpan, e.InsertedText?.Text ?? string.Empty));
+            _currentText = _currentText.WithChanges(new TextChange(textSpan, e.InsertedText?.Text ?? ""));
 
             TextChanged?.Invoke(this, new TextChangeEventArgs(oldText, _currentText, textChangeRange));
         }
@@ -83,7 +83,7 @@ namespace RoslynPad.Editor
 
                 foreach (var change in changes)
                 {
-                    var newTextChange = change.NewText ?? string.Empty;
+                    var newTextChange = change.NewText ?? "";
                     Document.Replace(change.Span.Start + documentOffset, change.Span.Length, new StringTextSource(newTextChange));
 
                     var changeOffset = newTextChange.Length - change.Span.Length;

+ 1 - 1
roslynpad/src/RoslynPad.Editor.Shared/RoslynCompletionData.cs

@@ -67,7 +67,7 @@ namespace RoslynPad.Editor
                 {
                     document.Replace(
                         new TextSegment { StartOffset = textChange.Span.End, EndOffset = completionSegment.EndOffset },
-                        string.Empty);
+                        "");
                 }
 
                 document.Replace(textChange.Span.Start, textChange.Span.Length,

+ 2 - 2
roslynpad/src/RoslynPad.Editor.Windows/SearchReplacePanel.cs

@@ -461,7 +461,7 @@ namespace RoslynPad.Editor
             var selectedResult = GetSelectedResult();
             if (selectedResult != null)
             {
-                var replacement = selectedResult.ReplaceWith(ReplacePattern ?? string.Empty);
+                var replacement = selectedResult.ReplaceWith(ReplacePattern ?? "");
                 _textArea.Selection.ReplaceSelectionWithText(replacement);
             }
 
@@ -493,7 +493,7 @@ namespace RoslynPad.Editor
                 var results = _renderer.CurrentResults.OrderByDescending(x => x.EndOffset).ToArray();
                 foreach (var result in results)
                 {
-                    var replacement = result.ReplaceWith(ReplacePattern ?? string.Empty);
+                    var replacement = result.ReplaceWith(ReplacePattern ?? "");
                     document.Replace(result.Offset, result.Length, new StringTextSource(replacement));
                 }
             }