+
Skip to content

Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /Providers/Resgrid.Providers.Marketing in the nuget group across 1 directory #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /Providers/Resgrid.Providers.Marketing in the nuget group across 1 directory #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Core/Resgrid.Framework/Resgrid.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Resgrid.Framework</AssemblyName>
Expand All @@ -9,11 +8,9 @@
<Description>Resgrid cad and personnel resource logistics system</Description>
<Configurations>Debug;Release;Docker</Configurations>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\Common\Resgrid-PubPriv-KeyFile.snk" Link="Resgrid-PubPriv-KeyFile.snk" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.40" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand All @@ -27,9 +24,13 @@
<PackageReference Include="TimeZoneConverter" Version="5.0.0" />
<PackageReference Include="Vereyon.Web.HtmlSanitizer" Version="1.6.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Resgrid.Config\Resgrid.Config.csproj" />
</ItemGroup>

</Project>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
</Project>
15 changes: 7 additions & 8 deletions Core/Resgrid.Model/Resgrid.Model.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Configurations>Debug;Release;Docker</Configurations>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="..\..\Web\Resgrid.WebCore\wwwroot\audio\caf\Emergency_call.caf" Link="Audio\Emergency_call.caf" />
<EmbeddedResource Include="..\..\Web\Resgrid.WebCore\wwwroot\audio\caf\High_call.caf" Link="Audio\High_call.caf" />
Expand All @@ -30,15 +28,12 @@
<EmbeddedResource Include="..\..\Web\Resgrid.WebCore\wwwroot\audio\wav\Upcoming_shift.wav" Link="Audio\Upcoming_shift.wav" />
<EmbeddedResource Include="..\..\Web\Resgrid.WebCore\wwwroot\audio\wav\Upcoming_Training.wav" Link="Audio\Upcoming_Training.wav" />
</ItemGroup>

<ItemGroup>
<Folder Include="Audio\" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\Common\Resgrid-PubPriv-KeyFile.snk" Link="Resgrid-PubPriv-KeyFile.snk" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="GeoCoordinate.NetCore" Version="1.0.0.1" />
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
Expand All @@ -50,10 +45,14 @@
<PackageReference Include="Stripe.net" Version="39.88.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Resgrid.Config\Resgrid.Config.csproj" />
<ProjectReference Include="..\Resgrid.Framework\Resgrid.Framework.csproj" />
</ItemGroup>

</Project>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
</Project>
12 changes: 7 additions & 5 deletions Providers/Resgrid.Providers.Marketing/Resgrid.Providers.Marketing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Configurations>Debug;Release;Docker</Configurations>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="6.3.0" />
<PackageReference Include="RestSharp" Version="107.1.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\Resgrid.Config\Resgrid.Config.csproj" />
<ProjectReference Include="..\..\Core\Resgrid.Framework\Resgrid.Framework.csproj" />
<ProjectReference Include="..\..\Core\Resgrid.Model\Resgrid.Model.csproj" />
</ItemGroup>

</Project>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Providers/Resgrid.Providers.Marketing/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="4.8.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="netstandard2.1" />
<package id="RestSharp" version="105.2.3" targetFramework="net46" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
</packages>
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载