Skip to content

Commit 3d3f78a

Browse files
authored
Remove dependency on NuGet Extended.Wpf.Toolkit
Since it does not have an Open Source license that we can use under our MIT license.
1 parent f026f0d commit 3d3f78a

File tree

5 files changed

+13
-119
lines changed

5 files changed

+13
-119
lines changed

NOTICE.txt

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,24 +2295,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
22952295

22962296
-------------------------------------------------------------------
22972297

2298-
AdaptiveCards.Rendering.Wpf.Xceed 1.2.4 - MIT
2299-
(c) 2008 VeriSign, Inc.
2300-
(c) Microsoft Corporation.
2301-
2302-
MIT License
2303-
2304-
Copyright (c) <year> <copyright holders>
2305-
2306-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2307-
2308-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
2309-
2310-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2311-
2312-
-------------------------------------------------------------------
2313-
2314-
-------------------------------------------------------------------
2315-
23162298
Jot 1.4.1 - MIT
23172299
Copyright 2017
23182300
(c) 2008 VeriSign, Inc.
@@ -2933,82 +2915,6 @@ This license governs use of the accompanying software. If you use the software,
29332915

29342916
-------------------------------------------------------------------
29352917

2936-
Extended.Wpf.Toolkit 3.7.0 - OTHER
2937-
(c) 2006 thawte, Inc.
2938-
(c) 2008 VeriSign, Inc.
2939-
(c) Copyright Xceed Software, Inc.
2940-
Copyright (c) Xceed Software Inc. 2007-2018
2941-
Copyright (c) Xceed Software Inc. 2010-2019 Extended WPF Toolkit
2942-
Copyright (c) Xceed Software Inc. 2007-2018 nXceed.Wpf.Toolkit.Themes.Office2007,PublicKey
2943-
2944-
XCEED SOFTWARE, INC.
2945-
2946-
COMMUNITY LICENSE AGREEMENT (for non-commercial use)
2947-
2948-
This "Agreement" is a legal agreement between you, a software developer ("Licensee") and Xceed Software, Inc. ("Xceed").
2949-
You, the Licensee, wish to use Xceed's product "Xceed Extended WPF Toolkit" (the "Software"), an Xceed product, for use
2950-
in a non-commercial application or system or program. "Non-Commercial use" means not primarily intended for commercial
2951-
advantages or for monetary compensation or any other type of compensation. Xceed agrees to license its products to
2952-
developers like you as along as all terms & conditions set forth herein are respected. Xceed Software is provided under
2953-
a license; it is not "sold" in any manner. By installing, copying or otherwise using the Software, you confirm your
2954-
agreement to the terms and conditions expressed in this Agreement. If you do not agree, you are not authorized to use our
2955-
Software. If you are not a software developer, you are not authorized to use our Software.
2956-
2957-
2958-
GENERAL
2959-
2960-
This license is perpetual (or until revoked by Xceed), provided that:
2961-
-All License Agreement terms & conditions are strictly followed by the Licensee;
2962-
-Xceed Software is used for non-commercial purposes only (no re-selling, licensing or sub-licensing or any other rights of
2963-
use);
2964-
-Xceed's name and logo must appear clearly in the resulting work with an Xceed Copyright notice; the name and notice must be
2965-
visible, not be hidden.
2966-
2967-
Pursuant to these conditions, Xceed grants to Licensee a non-exclusive right to install and use the Software for designing,
2968-
building, testing and/or deploying an application or system or program for non-commercial purposes only, without the need to
2969-
acquire a subscription. Would Licensee need to use the Software in any commercial way or purpose, Licensee must acquire a
2970-
Commercial License (with a paid subscription).
2971-
2972-
Licensee is not authorized to:
2973-
-sell or license/sub-license/lease the resulting work to anyone nor charge any amounts of money or exchange services for the
2974-
said resulting work;
2975-
-"deploy" the Software for/in a commercial environment;
2976-
-create a competitive software product based on Xceed Software;
2977-
2978-
2979-
SUPPORT
2980-
2981-
Support is not included in Community Licenses. The Software is provided on an "as is" basis only. Licensee can send requests
2982-
to Xceed's technical support team only if a commercial license has been obtained. Bugs may be corrected at Xceed's discretion.
2983-
2984-
2985-
WARRANTY
2986-
2987-
Xceed clearly states that this Community License includes no warranty of any type. Xceed products are provided on an "as is"
2988-
basis. In no case shall Xceed be responsible or liable for any direct or indirect, or consequential damages whatsoever (including,
2989-
without limitation, any damages for loss of revenues, of business profits, business interruption, or loss of business information,
2990-
or any other type of loss or damages) arising out of the use of the Software even if Xceed may have been advised of such potential
2991-
damages or loss.
2992-
2993-
2994-
OTHER
2995-
2996-
Xceed does not allow Community Licensees to publish results from benchmarks or performance comparison tests (with other products)
2997-
without advance permission by Xceed. Licensee is not authorized to use Xceed's name, tradenames and trademarks without Xceed's written
2998-
permission (other than the Copyright notice stated above in the "General" section).
2999-
3000-
3001-
GOVERNING LAW
3002-
3003-
This Agreement shall be governed by the laws of the Province of Quebec (Canada). Any claim, dispute or problem arising out of this
3004-
Agreement shall be deemed non-receivable or may be settled or disposed of at Xceed's discretion. Xceed reserves the right to settle
3005-
any action before an arbitration board in Quebec as per generally accepted, international rules of arbitration prevailing in Quebec.
3006-
3007-
Xceed reserves the right to modify this Agreement at all times without notice.
3008-
3009-
(C) Copyright: Xceed Software, Inc. - 2019. All rights reserved.
3010-
3011-
-------------------------------------------------------------------
30122918
__ _____ _____ _____
30132919
__| | __| | | | JSON for Modern C++
30142920
| | |__ | | | | | | version 3.7.3

clients/csharp-wpf/VoiceAssistantClient/App.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
1010
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1111
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
15-
</dependentAssembly>
1612
<dependentAssembly>
1713
<assemblyIdentity name="Microsoft.MarkedNet" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1814
<bindingRedirect oldVersion="0.0.0.0-1.0.13.0" newVersion="1.0.13.0" />

clients/csharp-wpf/VoiceAssistantClient/MainWindow.xaml.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,19 @@ public MainWindow()
5656
Services.Tracker.Configure(this.settings).Apply();
5757

5858
this.renderer = new AdaptiveCardRenderer();
59-
this.renderer.UseXceedElementRenderers();
59+
60+
/*
61+
Xceed Enhanced Input Package
62+
This optional package enhances the Adaptive Card input controls beyond what WPF provides out of the box.
63+
To enable it:
64+
1. Add the NuGet package Extended.Wpf.Toolkit by Xceed to the project
65+
2. Add the NuGet package AdaptiveCards.Rendering.Wpf.Xceed by Microsoft to the project
66+
3. Uncomment the one line below
67+
This option is not included here because of its license terms.
68+
For more info: https://docs.microsoft.com/en-us/adaptive-cards/sdk/rendering-cards/net-wpf/getting-started
69+
*/
70+
// this.renderer.UseXceedElementRenderers();
71+
6072
var configFile = Path.Combine(System.Reflection.Assembly.GetExecutingAssembly().Location, "AdaptiveCardsHostConfig.json");
6173
if (File.Exists(configFile))
6274
{

clients/csharp-wpf/VoiceAssistantClient/VoiceAssistantClient.csproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@
104104
<Reference Include="AdaptiveCards.Rendering.Wpf, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105105
<HintPath>..\packages\AdaptiveCards.Rendering.Wpf.1.2.4\lib\net452\AdaptiveCards.Rendering.Wpf.dll</HintPath>
106106
</Reference>
107-
<Reference Include="AdaptiveCards.Rendering.Wpf.Xceed, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<HintPath>..\packages\AdaptiveCards.Rendering.Wpf.Xceed.1.2.4\lib\net452\AdaptiveCards.Rendering.Wpf.Xceed.dll</HintPath>
109-
</Reference>
110107
<Reference Include="Jot, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
111108
<HintPath>..\packages\Jot.1.4.1\lib\net45\Jot.dll</HintPath>
112109
</Reference>
@@ -152,21 +149,6 @@
152149
<Reference Include="WindowsBase" />
153150
<Reference Include="PresentationCore" />
154151
<Reference Include="PresentationFramework" />
155-
<Reference Include="Xceed.Wpf.AvalonDock, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
156-
<HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
157-
</Reference>
158-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
159-
<HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
160-
</Reference>
161-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
162-
<HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
163-
</Reference>
164-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
165-
<HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
166-
</Reference>
167-
<Reference Include="Xceed.Wpf.Toolkit, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
168-
<HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
169-
</Reference>
170152
</ItemGroup>
171153
<ItemGroup>
172154
<ApplicationDefinition Include="App.xaml">

clients/csharp-wpf/VoiceAssistantClient/packages.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<packages>
33
<package id="AdaptiveCards" version="1.2.4" targetFramework="net461" />
44
<package id="AdaptiveCards.Rendering.Wpf" version="1.2.4" targetFramework="net461" />
5-
<package id="AdaptiveCards.Rendering.Wpf.Xceed" version="1.2.4" targetFramework="net461" />
6-
<package id="Extended.Wpf.Toolkit" version="3.8.1" targetFramework="net461" />
75
<package id="Jot" version="1.4.1" targetFramework="net461" />
86
<package id="Microsoft.Bot.Schema" version="4.9.1" targetFramework="net461" />
97
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="3.0.0" targetFramework="net461" developmentDependency="true" />

0 commit comments

Comments
 (0)