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

Upgrade DynamicProxy to version 5.0.0 #1257

Merged
merged 6 commits into from May 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).


## Unreleased

New major version of DynamicProxy (you may get better performance!), so please update with care.

#### Changed

* Update package reference to `Castle.Core` (DynamicProxy) from version 4.4.1 to 5.0.0 (@stakx, #1257)

#### Fixed

* Can't set up "private protected" properties (@RobSiklos, #1170)
* Using [...] an old version of `System.Net.Http` which is vulnerable to "DoS", "Spoofing", "Privilege Escalation", "Authentication Bypass" and "Information Exposure" (@sidseter, #1219)


## 4.17.2 (2022-03-06)

#### Fixed
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
@@ -1,4 +1,4 @@
image: Visual Studio 2019
image: Visual Studio 2022

init:
- git config --global core.autocrlf input
Expand Down
8 changes: 4 additions & 4 deletions src/Moq/Moq.csproj
Expand Up @@ -6,20 +6,20 @@
<Import Project="$(BuildDirectory)SourceLink.props" />

<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<AssemblyName>Moq</AssemblyName>
<DebugSymbols>True</DebugSymbols>
<DebugType>embedded</DebugType>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>0419</NoWarn>
<NoWarn>$(NoWarn);0419;CS8032</NoWarn>
<RootNamespace>Moq</RootNamespace>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0' ">
<DefineConstants>$(DefineConstants);FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
</PropertyGroup>

Expand All @@ -43,7 +43,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.4.1" />
<PackageReference Include="Castle.Core" Version="5.0.0" />
<PackageReference Include="IFluentInterface" Version="2.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj
Expand Up @@ -4,7 +4,7 @@
<Import Project="$(BuildDirectory)SignAssembly.props" />

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<IsPackable>False</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
Expand Up @@ -5,7 +5,7 @@
<Import Project="$(BuildDirectory)xUnit.props" />

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<IsPackable>False</IsPackable>
Expand Down
7 changes: 4 additions & 3 deletions tests/Moq.Tests/Moq.Tests.csproj
Expand Up @@ -5,24 +5,25 @@
<Import Project="$(BuildDirectory)xUnit.props" />

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<AssemblyName>Moq.Tests</AssemblyName>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<LangVersion>8.0</LangVersion>
<IsPackable>False</IsPackable>
<NoWarn>$(NoWarn);CS8032</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<DefineConstants>$(DefineConstants);FEATURE_DYNAMICPROXY_SERIALIZABLE_PROXIES;FEATURE_EF;FEATURE_SYSTEM_WEB;FEATURE_SYSTEM_WINDOWS_FORMS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' ">
<DefineConstants>$(DefineConstants);FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.4.1" />
<PackageReference Include="Castle.Core" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
Expand Down
1 change: 0 additions & 1 deletion tests/Moq.Tests/Regressions/IssueReportsFixture.cs
Expand Up @@ -970,7 +970,6 @@ public void strict_mock_accepts_null_as_nullable_guid_value()

public class Issue193
{
[Fact(Skip = "Fails due to a bug in Castle DynamicProxy. Try enabling this test once we reference Castle.Core > 4.4.0.")]
public void Can_mock_class_type_where_generic_type_parameter_name_diverges_from_name_in_interface()
{
var mock = new Mock<C>();
Expand Down