Skip to content
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.

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

Update dependencies to fix vulnerable usages #212

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 23 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
CHANGELOG
=========
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed

## [Released]

- **AasxFileServerRestLibrary**: Restsharp **108.0.1** to **111.1.0**
- **AasxIntegrationBaseGdi**: Magick.NET.Core **12.2.0** to **13.8.0**
- **AasxIntegrationBaseGdi**: Magick.NET-Q8-AnyCPU **12**.2.0**** to **13.8.0**
- **AasxIntegrationBaseGdi**: System.Drawing.Common **7.0.0** to **8.0.5**
- **AasxIntegrationBaseWpf**: Microsoft.Windows.Compatibility **6.0.0** to **8.0.5**
- **AasxOpenidClient**: System.IdentityModel.Tokens.Jwt **6.24.0** to **6.35.0**
- **AasxPackageExplorer**: Magick.NET.Core **12.2.0** to **13.8.0**
- **AasxPackageExplorer**: Magick.NET-Q8-AnyCPU **12.2.0** to **13.8.0**
- **AasxPackageExplorer**: System.Drawing.Common **7.0.0** to **8.0.5**
- **AasxPackageLogic**: System.IdentityModel.Tokens.Jwt **6.24.0** to **6.35.0**

Re-release (2020-05-11)
-----------------------
Expand Down
38 changes: 19 additions & 19 deletions src/AasxFileServerRestLibrary/AasxFileServerRestLibrary.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>IO.Swagger</AssemblyName>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<ItemGroup>
<Using Include="AasCore.Aas3_0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonSubTypes" Version="1.9.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RestSharp" Version="108.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasCore.Aas3_0\AasCore.Aas3_0.csproj" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>IO.Swagger</AssemblyName>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<ItemGroup>
<Using Include="AasCore.Aas3_0"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonSubTypes" Version="1.9.0"/>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="RestSharp" Version="111.1.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasCore.Aas3_0\AasCore.Aas3_0.csproj"/>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="12.2.0" />
<PackageReference Include="Magick.NET.Core" Version="12.2.0" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.8.0" />
<PackageReference Include="Magick.NET.Core" Version="13.8.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ItemGroup>
<PackageReference Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<Page Remove="OriginalResources\FormSmaller.xaml" />
Expand Down
2 changes: 1 addition & 1 deletion src/AasxOpenidClient/AasxOpenidClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="jose-jwt" Version="4.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/AasxPackageExplorer.sln
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
Notes_V3.md = Notes_V3.md
README-packages.md = README-packages.md
..\CHANGELOG.md = ..\CHANGELOG.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AasxDictionaryImport", "AasxDictionaryImport\AasxDictionaryImport.csproj", "{DEC389BC-59BC-48E5-B163-6E44CE782C4A}"
Expand Down
6 changes: 3 additions & 3 deletions src/AasxPackageExplorer/AasxPackageExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
<PackageReference Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
<PackageReference Include="jose-jwt" Version="4.0.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="12.2.2" />
<PackageReference Include="Magick.NET.Core" Version="12.2.2" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.8.0" />
<PackageReference Include="Magick.NET.Core" Version="13.8.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" />
<PackageReference Include="SSharp.Net" Version="1.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/AasxPackageLogic/AasxPackageLogic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SSharp.Net" Version="1.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common.NETCore" Version="115.3.110" />
<PackageReference Include="CefSharp.Common.NETCore" Version="124.3.80" />
<PackageReference Include="CefSharp.Wpf.NETCore" Version="115.3.110" />
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.CodeDom" Version="7.0.0" />
<PackageReference Include="System.CodeDom" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.29" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.29" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading