WindyMadman/dnSpy
1
0
Fork 0
mirror of https://github.com/dnSpy/dnSpy.git synced 2025-01-08 11:57:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1597 from augustoproiete-forks/update-ookii-dialogs-to-v3

Browse Source 
Update Ookii.Dialogs.Wpf to v3.0.1 (.NET 5 support)
This commit is contained in:
0xd4d 2020-11-19 23:24:47 +01:00 committed by GitHub
commit 2fa5c978b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DnSpyCommon.props
View File

@ -43,7 +43,7 @@
<MSVSIntellisenseVersion>15.5.27130</MSVSIntellisenseVersion>
<MSVSTextVersion>15.5.27130</MSVSTextVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
<OokiiDialogsVersion>1.0.0</OokiiDialogsVersion>
<OokiiDialogsWpfVersion>3.0.1</OokiiDialogsWpfVersion>
<RoslynVersion>2.10.0</RoslynVersion>
<SCCompositionVersion>4.6.0</SCCompositionVersion>
</PropertyGroup>

2
dnSpy/dnSpy.Contracts.DnSpy/dnSpy.Contracts.DnSpy.csproj
View File

@ -36,7 +36,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ookii.Dialogs" Version="$(OokiiDialogsVersion)" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="$(OokiiDialogsWpfVersion)" />
<!--TODO: This is a workaround for a bug where we get the wrong version of System.Security.Permissions.
Microsoft.VisualStudio.Composition.NetFxAttributes and Microsoft.VisualStudio.Composition reference
System.ComponentModel.Composition 4.5.0 which references System.Security.Permissions 4.5.0 which has

45
dnSpy/dnSpy/LicenseInfo/OtherLicenses.txt
View File

@ -102,36 +102,39 @@ Roslyn:
NOTE: The license file is called ApacheV2.txt
***********************************************************************************
Ookii.Dialogs:
License agreement for Ookii.Dialogs.
Ookii.Dialogs.Wpf:
License agreement for Ookii.Dialogs.Wpf.
Copyright © Sven Groot (Ookii.org) 2009
BSD 3-Clause License
Copyright (c) C. Augusto Proiete 2018-2020
Copyright (c) Sven Groot 2009-2018
All rights reserved.
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2) Redistributions in binary form must reproduce the above copyright notice,
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3) Neither the name of the ORGANIZATION nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************************
Microsoft.Diagnostics.Runtime (aka clrmd):