Skip to content

Commit

Permalink
Switch back to use only use features supoprted in C# 7.3 and consolid…
Browse files Browse the repository at this point in the history
…ate/upgrade packages
  • Loading branch information
joelvaneenwyk committed May 8, 2024
1 parent cfab858 commit ca54a70
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public EntityMetadata GetEntity(string logicalName)
return metadata;
}

public EntityMetadata GetEntity(int otc)
public EntityMetadata GetEntity(int? otc)
{
if (fetchXmlBuilder.entities == null)
{
Expand Down
19 changes: 8 additions & 11 deletions FetchXmlBuilder/FetchXmlBuilder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<OutputType>Library</OutputType>
<RootNamespace>Cinteros.Xrm.FetchXmlBuilder</RootNamespace>
<AssemblyName>Rappen.XTB.FXB</AssemblyName>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<WebView2LoaderPreference>Static</WebView2LoaderPreference>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down Expand Up @@ -121,16 +117,17 @@
<PackageReference Include="DockPanelSuite" Version="3.1.0" />
<PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
<PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.51" />
<PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.52" />
<PackageReference Include="Microsoft.CrmSdk.Deployment" Version="9.0.2.34" />
<PackageReference Include="Microsoft.CrmSdk.Workflow" Version="9.0.2.51" />
<PackageReference Include="Microsoft.CrmSdk.Workflow" Version="9.0.2.52" />
<PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.1.45" />
<PackageReference Include="Microsoft.CrmSdk.XrmTooling.WpfControls" Version="9.1.1.45" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.58.1" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
<PackageReference Include="Microsoft.IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="7.0.3" />
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="7.5.1" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="6.0.0-preview.4.21253.7" />
Expand All @@ -139,15 +136,15 @@
<PackageReference Include="Microsoft.PowerFx.Transport.Attributes" Version="1.2.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
<PackageReference Include="Microsoft.Web.WebView2">
<Version>1.0.2151.40</Version>
<Version>1.0.2478.35</Version>
</PackageReference>
<PackageReference Include="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" />
<PackageReference Include="MscrmTools.Xrm.Connection" Version="1.2023.6.56" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<PackageReference Include="System.IO" Version="4.3.0" />
Expand All @@ -162,7 +159,7 @@
<PackageReference Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="XrmToolBoxPackage" Version="1.2023.10.67" />
Expand Down

0 comments on commit ca54a70

Please sign in to comment.