From b3d4227b928a2b09f3502b07192ac0347b2e8dc7 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Fri, 26 Nov 2021 23:33:04 +0100 Subject: [PATCH 1/5] Removing the vsix project --- NUnit3TestAdapter.sln | 13 +- build.cake | 10 - .../NUnit3TestAdapterInstall.csproj | 64 ------ src/NUnit3TestAdapterInstall/license.rtf | 205 ------------------ src/NUnit3TestAdapterInstall/nunit_90.png | Bin 5750 -> 0 bytes src/NUnit3TestAdapterInstall/preview.png | Bin 9004 -> 0 bytes .../source.extension.vsixmanifest | 30 --- 7 files changed, 2 insertions(+), 320 deletions(-) delete mode 100644 src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj delete mode 100644 src/NUnit3TestAdapterInstall/license.rtf delete mode 100644 src/NUnit3TestAdapterInstall/nunit_90.png delete mode 100644 src/NUnit3TestAdapterInstall/preview.png delete mode 100644 src/NUnit3TestAdapterInstall/source.extension.vsixmanifest diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln index 19c84e9c..e8ca1a50 100644 --- a/NUnit3TestAdapter.sln +++ b/NUnit3TestAdapter.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28606.126 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7CE30108-5D81-4850-BE6B-C8BCA35D3592}" ProjectSection(SolutionItems) = preProject @@ -36,11 +36,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter", "src\NUnitTestAdapter\NUnit.TestAdapter.csproj", "{1E9364E9-9D4F-4FA9-8A0C-09A66252449F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter.Tests", "src\NUnitTestAdapterTests\NUnit.TestAdapter.Tests.csproj", "{D4061204-B7A4-4E1F-A8FD-2035758B3AD8}" - ProjectSection(ProjectDependencies) = postProject - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD} = {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit3TestAdapterInstall", "src\NUnit3TestAdapterInstall\NUnit3TestAdapterInstall.csproj", "{D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3AdapterExternalTests", "src\NUnit3AdapterExternalTests\NUnit3AdapterExternalTests.csproj", "{A4EA819A-D77D-46D3-B2B7-2C754DBD2BC7}" EndProject @@ -78,10 +73,6 @@ Global {D4061204-B7A4-4E1F-A8FD-2035758B3AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4061204-B7A4-4E1F-A8FD-2035758B3AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4061204-B7A4-4E1F-A8FD-2035758B3AD8}.Release|Any CPU.Build.0 = Release|Any CPU - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD}.Release|Any CPU.Build.0 = Release|Any CPU {A4EA819A-D77D-46D3-B2B7-2C754DBD2BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4EA819A-D77D-46D3-B2B7-2C754DBD2BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4EA819A-D77D-46D3-B2B7-2C754DBD2BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/build.cake b/build.cake index 078c4368..b41b4c2d 100644 --- a/build.cake +++ b/build.cake @@ -290,15 +290,6 @@ Task("PackageNuGet") }); }); -Task("PackageVsix") - .IsDependentOn("CreatePackageDir") - .Does(() => - { - CopyFile( - BIN_DIR + "NUnit3TestAdapter.vsix", - PACKAGE_DIR + packageName + ".vsix"); - }); - ////////////////////////////////////////////////////////////////////// // TASK TARGETS ////////////////////////////////////////////////////////////////////// @@ -316,7 +307,6 @@ Task("Test") Task("Package") .IsDependentOn("PackageZip") .IsDependentOn("PackageNuGet") - .IsDependentOn("PackageVsix"); Task("QuickRelease") .IsDependentOn("Build") diff --git a/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj b/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj deleted file mode 100644 index 9c4eaf58..00000000 --- a/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {D6990436-E3BA-4AC1-8A7D-9FFF9C3B19AD} - Library - NUnit3TestAdapter - false - false - false - false - false - false - False - win - false - ..\..\bin\$(Configuration)\ - ..\NUnitTestAdapter\bin\$(Configuration)\net35\ - - - - - - - - - - - - - Always - true - - - Always - true - - - Always - true - - - - - - - TargetFramework=net35 - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - \ No newline at end of file diff --git a/src/NUnit3TestAdapterInstall/license.rtf b/src/NUnit3TestAdapterInstall/license.rtf deleted file mode 100644 index 15be99e9..00000000 --- a/src/NUnit3TestAdapterInstall/license.rtf +++ /dev/null @@ -1,205 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f43\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f44\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f46\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f47\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f48\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f49\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f50\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f51\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f383\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} -{\f384\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f386\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f387\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f390\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} -{\f391\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;} -{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;} -{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;} -{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} -{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);} -{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);} -{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0; -\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128; -\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 } -\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 -\fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused -Normal Table;}}{\*\rsidtbl \rsid1519903\rsid10170943\rsid16385759}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Terje Sandstrom} -{\creatim\yr2020\mo1\dy3\hr12\min40}{\revtim\yr2021\mo6\dy7\hr21\min1}{\version3}{\edmins1}{\nofpages1}{\nofwords165}{\nofchars943}{\nofcharsws1106}{\vern25}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} -\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot1519903 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 -\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 -\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 -\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af0\afs24 \ltrch\fcs0 \b\f0\fs24\ul\insrsid16385759 \hich\af0\dbch\af31505\loch\f0 NUnit 3 Test Adapter -\par }{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid16385759 \hich\af0\dbch\af31505\loch\f0 Copyright (c) 2015-20}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid1519903 \hich\af0\dbch\af31505\loch\f0 2}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid10170943 -\hich\af0\dbch\af31505\loch\f0 1}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid16385759 \hich\af0\dbch\af31505\loch\f0 Charlie Poole, 2014-20}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid1519903 \hich\af0\dbch\af31505\loch\f0 2}{\rtlch\fcs1 \ab\af0 -\ltrch\fcs0 \b\f0\insrsid10170943 \hich\af0\dbch\af31505\loch\f0 1}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\f0\insrsid16385759 \hich\af0\dbch\af31505\loch\f0 Terje Sandstrom -\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\insrsid16385759 \hich\af0\dbch\af31505\loch\f0 -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, m -\hich\af0\dbch\af31505\loch\f0 e\hich\af0\dbch\af31505\loch\f0 rge, 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: -\par \hich\af0\dbch\af31505\loch\f0 The above copyright notice and this permission notice shall be included in all \hich\af0\dbch\af31505\loch\f0 copies or substantial portions of the Software. -\par \hich\af0\dbch\af31505\loch\f0 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 -\hich\af0\dbch\af31505\loch\f0 - 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. - -\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a -9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad -5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 -b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 -0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 -a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f -c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 -0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 -a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 -6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b -4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b -4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f -7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd -ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d -7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b -d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52 -fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71 -b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b -fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567 -9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd -79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf -5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2 -d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1 -738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68 -2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac -5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a -b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9 -493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2 -be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f -f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64 -7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e -b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4 -6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd -f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d -7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39 -4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf -1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a -faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2 -67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9 -416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27 -1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b -8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4 -8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65 -2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36 -3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e -3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985 -0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000 -0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000 -000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000 -7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000 -000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000 -000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000} -{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d -617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 -6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 -656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} -{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; -\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; -\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; -\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; -\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; -\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; -\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; -\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; -\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; -\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; -\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; -\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; -\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; -\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; -\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; -\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; -\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; -\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; -\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; -\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; -\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; -\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; -\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; -\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; -\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; -\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; -\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; -\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; -\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; -\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; -\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; -\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; -\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; -\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; -\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; -\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; -\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; -\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 -02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 -d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000030a9 -fd7ecf5bd701feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/src/NUnit3TestAdapterInstall/nunit_90.png b/src/NUnit3TestAdapterInstall/nunit_90.png deleted file mode 100644 index b6a16a3b4729a46549b4ea24fe6cc2a1b0882748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5750 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 diff --git a/src/NUnit3TestAdapterInstall/preview.png b/src/NUnit3TestAdapterInstall/preview.png deleted file mode 100644 index c6c0643333bb926c2939a47513435f3a9f513e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9004 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 Xd~^~YcJ}WN7ZgQVRhbGYNZ|hf*Sf7( diff --git a/src/NUnit3TestAdapterInstall/source.extension.vsixmanifest b/src/NUnit3TestAdapterInstall/source.extension.vsixmanifest deleted file mode 100644 index b107504c..00000000 --- a/src/NUnit3TestAdapterInstall/source.extension.vsixmanifest +++ /dev/null @@ -1,30 +0,0 @@ - - - - - NUnit 3 Test Adapter - NUnit 3 adapter for running tests in Visual Studio. Works with NUnit 3.x and higher. -Note that use of VSIX Test adapters are deprecated in VS 2019 and later, we recommend you to use the nuget versions of the adapter. -(For running NUnit 2 tests, use the NUnit 2 adapter.) - https://docs.nunit.org/articles/vs-test-adapter/Index.html - license.rtf - nunit_90.png - preview.png - test, Testing, adapter, NUnit, TDD, NUnit3, UnitTesting - - - - - - - - - - - - - - - - - From 9798da3b2842675c01d6295e6d13968ab157a557 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Fri, 26 Nov 2021 23:36:09 +0100 Subject: [PATCH 2/5] update --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index b41b4c2d..be5a2324 100644 --- a/build.cake +++ b/build.cake @@ -306,7 +306,7 @@ Task("Test") Task("Package") .IsDependentOn("PackageZip") - .IsDependentOn("PackageNuGet") + .IsDependentOn("PackageNuGet"); Task("QuickRelease") .IsDependentOn("Build") From 4dd9a892b1dea8e99cb9f77389895a7c0cfbc04a Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sat, 27 Nov 2021 00:20:41 +0100 Subject: [PATCH 3/5] Fix for Issue918, generic fixture --- build.cake | 4 +- .../NUnitEngine/DiscoveryConverter.cs | 10 ++++- .../Properties/AssemblyInfo.cs | 6 +-- .../NUnitEngineTests/NUnitDiscoveryTests.cs | 38 ++++++++++++++----- src/NUnitTestAdapterTests/ProjectTests.cs | 31 +-------------- 5 files changed, 43 insertions(+), 46 deletions(-) diff --git a/build.cake b/build.cake index be5a2324..d71d987e 100644 --- a/build.cake +++ b/build.cake @@ -12,8 +12,8 @@ var configuration = Argument("configuration", "Release"); // SET PACKAGE VERSION ////////////////////////////////////////////////////////////////////// -var version = "4.1.0"; -var modifier = ""; +var version = "4.2.0"; +var modifier = "-alpha.1"; var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : ""; var packageVersion = version + modifier + dbgSuffix; diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs index ce10ab61..9473a515 100644 --- a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs +++ b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs @@ -282,8 +282,16 @@ private void ExtractTestFixtures(NUnitDiscoveryCanHaveTestFixture parent, XEleme ExtractTestFixtures(ptf, child); } break; + case GenericFixture: + var gf = ExtractGenericTestFixture(parent, node); + parent.AddTestGenericFixture(gf); + if (child.HasElements) + { + ExtractTestFixtures(gf, child); + } + break; default: - throw new DiscoveryException($"Not a TestFixture, SetUpFixture, ParameterizedFixture or TestSuite, but {type}"); + throw new DiscoveryException($"Not a TestFixture, SetUpFixture, ParameterizedFixture, GenericFixture or TestSuite, but {type}"); } } } diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs index 8d6e7267..448763b5 100644 --- a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs +++ b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("NUnit3 Test Adapter for Visual Studio")] -[assembly: AssemblyDescription("A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your Azure DevOps server.\r\n \r\nNote that this package ONLY contains the adapter, not the NUnit framework. You must also get the framework.\r\n\r\nThe package works with Visual Studio 2012 and newer.\r\n")] +[assembly: AssemblyDescription("A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. \n\r\nThe package works with Visual Studio 2012 and newer, dotnet test and VSTest.Console.\r\n")] [assembly: AssemblyCompany("NUnit Project")] [assembly: AssemblyProduct("NUnit3TestAdapter")] [assembly: AssemblyCopyright("Copyright © 2011-2021 Charlie Poole, 2014-2021 Terje Sandstrom")] @@ -21,7 +21,7 @@ [assembly: ComVisible(false)] [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")] -[assembly: AssemblyVersion("4.1.0.0")] -[assembly: AssemblyFileVersion("4.1.0.0")] +[assembly: AssemblyVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.2.0.0")] [assembly: InternalsVisibleTo("NUnit.VisualStudio.TestAdapter.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010029b97dea816272cc4ea44cf3cf666f8150d6dfe1274b6c2e6c4d54259b756888ec08ad6dd3ea0f540b30408b948ae5f39cf0c7b210abdec267b367ce1eccab97d5c6c02ee67090827ffd699544fa2add4849b45a1901eac08495bfee0397fba3946ff3912ce0b9a497818e418a77a0c8db4ca1780e7b6f6dd6911395fcc0faba")] diff --git a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs index 6bea784f..99d3f81d 100644 --- a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs +++ b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs @@ -1120,16 +1120,6 @@ public void ThatSetUpFixtureWorksIssue824() @" - - - - - - - - - - @@ -1159,6 +1149,34 @@ public void ThatSetUpFixtureWorksIssue884() Assert.That(ndr, Is.Not.Null); } + private const string GenericIssue918 = @" + + + + + + + + + + + + + + + + +"; + + [Test] + public void ThatGenericFixturesWorksIssue918() + { + var sut = new DiscoveryConverter(logger, settings); + var ndr = sut.ConvertXml( + new NUnitResults(XmlHelper.CreateXmlNode(GenericIssue918))); + Assert.That(ndr, Is.Not.Null); + } + private const string ExtractFixturesHandlesProperties = @" diff --git a/src/NUnitTestAdapterTests/ProjectTests.cs b/src/NUnitTestAdapterTests/ProjectTests.cs index dd31a979..ca409cb0 100644 --- a/src/NUnitTestAdapterTests/ProjectTests.cs +++ b/src/NUnitTestAdapterTests/ProjectTests.cs @@ -1,5 +1,5 @@ // *********************************************************************** -// Copyright (c) 2011-2017 Charlie Poole, Terje Sandstrom +// Copyright (c) 2011-2017 Charlie Poole, 2014-2021 Terje Sandstrom // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -23,7 +23,6 @@ using System.IO; using System.Linq; using System.Reflection; -using System.Xml.Linq; using NUnit.Framework; namespace NUnit.VisualStudio.TestAdapter.Tests @@ -51,34 +50,6 @@ public void ThatTheTestAdapterEndsWithTestAdapterDll() } - [Test] - public void ThatAdapterInstallProjectHasVsixManifestWithUnitTestExtensionAsset() - { - var location = TestContext.CurrentContext.TestDirectory; - var di = new DirectoryInfo(location).MoveUp(4); - Assert.That(di, Is.Not.Null, "Invalid parent"); - var installDir = di.EnumerateDirectories("NUnit3TestAdapterInstall").SingleOrDefault(); - Assert.That(installDir, Is.Not.Null, $"Didn't find NUnit3TestAdapterInstall folder at {di.Name}"); - var vsixManifestFile = installDir.EnumerateFiles("*.vsixmanifest").SingleOrDefault(); - Assert.That(vsixManifestFile, Is.Not.Null, $"Didn't find any vsixmanifestfile at folder {installDir.Name}"); - var vsixManifestTxt = File.ReadAllText(vsixManifestFile.FullName); - Assert.That(vsixManifestTxt.Length, Is.GreaterThan(0), "No content in vsixmanifestfile"); - - var vsixManifest = XDocument.Parse(vsixManifestTxt); - var desc = vsixManifest.Descendants(); - var assets = desc.FirstOrDefault(o => o.Name.LocalName == "Assets"); - Assert.That(assets, Is.Not.Null, "Missing Assets"); - var assetItems = vsixManifest.Descendants().Where(o => o.Name.LocalName == "Asset").ToList(); - Assert.That(assetItems.Count, Is.GreaterThanOrEqualTo(1), "Missing asset items"); - var unitTestAsset = assetItems.FirstOrDefault(o => o.Attribute("Type") != null && o.Attribute("Type").Value != null && - o.Attribute("Type").Value == "UnitTestExtension"); - Assert.That(unitTestAsset, Is.Not.Null, "No asset with type UnitTestExtension found"); - var path = unitTestAsset.Attribute("Path"); - Assert.That(path, Is.Not.Null, "UnitTestAsset must have path"); - Assert.That(path.Value.EndsWith("NUnit3.TestAdapter.dll"), "UnitTestAsset path must contain the NUNit3TestAdapter.dll"); - } - - [Test] public void ThatNoMSTestDLLIsCopiedToOutput() { From f051e7efa072726d231953904ff37e4073b55dcf Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sun, 28 Nov 2021 15:27:48 +0100 Subject: [PATCH 4/5] Update pipeline and adding --- .github/ISSUE_TEMPLATE.md | 2 +- NUnit3TestAdapter.sln | 14 +++++++++++++- azure-pipelines.yml | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 832653a9..a068340c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,5 +4,5 @@ When reporting a bug, please provide the following information to speed up triag * Visual Studio edition and full version number (see Help About) * A short repro, preferably attached or pointing to a git repo or gist * What .net platform and version is being targeted -* If TFS/VSTS issue, what version, hosted, on-premises, and what build task you see this in +* If TFS/VSTS issue, what version, hosted or on-premises, and what build task you see this in diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln index e8ca1a50..d212d540 100644 --- a/NUnit3TestAdapter.sln +++ b/NUnit3TestAdapter.sln @@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution LICENSE.txt = LICENSE.txt src\native-assembly\NativeTests.dll = src\native-assembly\NativeTests.dll NuGet.Config = NuGet.Config - .github\workflows\NUnit3TestAdapter.Cake.CI.yml = .github\workflows\NUnit3TestAdapter.Cake.CI.yml NUnit3TestAdapter.sln.DotSettings = NUnit3TestAdapter.sln.DotSettings images\nunit_256.png = images\nunit_256.png Osiris.Extended.ruleset = Osiris.Extended.ruleset @@ -51,6 +50,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp2.1", "netcoreapp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter.Tests.Acceptance", "src\NUnit.TestAdapter.Tests.Acceptance\NUnit.TestAdapter.Tests.Acceptance.csproj", "{3FAC7EE0-664F-4B11-918B-8E0FF865EE4C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{062B1763-73C8-4B5A-92DF-C66A36C43CE1}" + ProjectSection(SolutionItems) = preProject + .github\dependabot.yml = .github\dependabot.yml + .github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{7D708804-B2F1-4A31-A9FB-85A0C7433200}" + ProjectSection(SolutionItems) = preProject + .github\workflows\NUnit3TestAdapter.Cake.CI.yml = .github\workflows\NUnit3TestAdapter.Cake.CI.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +98,8 @@ Global GlobalSection(NestedProjects) = preSolution {D41249E3-C080-4B66-8CBD-99CE4D309A10} = {DE347D88-F6ED-4031-AFC2-318F63E39BC9} {A9584E41-6ECE-44B4-A504-41795A65DA5F} = {DE347D88-F6ED-4031-AFC2-318F63E39BC9} + {062B1763-73C8-4B5A-92DF-C66A36C43CE1} = {7CE30108-5D81-4850-BE6B-C8BCA35D3592} + {7D708804-B2F1-4A31-A9FB-85A0C7433200} = {062B1763-73C8-4B5A-92DF-C66A36C43CE1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8EF03474-188E-44A8-8C76-9FBCF9A382EC} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ebce5733..b58b0e55 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,14 +11,14 @@ jobs: - powershell: .\build.ps1 --target=CI --configuration=$(BuildConfiguration) displayName: Build, package, and test - - task: PublishBuildArtifacts@1 + - task: PublishBuildArtifact@1 displayName: Publish bin artifacts inputs: PathtoPublish: $(build.sourcesdirectory)\bin\$(BuildConfiguration) ArtifactName: Bin condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 + - task: PublishBuildArtifact@1 displayName: Publish package artifacts inputs: PathtoPublish: $(build.sourcesdirectory)\package From 7cbfe8100eb7b43929ba585634f0c51c258b816f Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sun, 28 Nov 2021 15:29:26 +0100 Subject: [PATCH 5/5] update azure pipeline yml --- azure-pipelines.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b58b0e55..b361fb26 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,19 +11,6 @@ jobs: - powershell: .\build.ps1 --target=CI --configuration=$(BuildConfiguration) displayName: Build, package, and test - - task: PublishBuildArtifact@1 - displayName: Publish bin artifacts - inputs: - PathtoPublish: $(build.sourcesdirectory)\bin\$(BuildConfiguration) - ArtifactName: Bin - condition: succeededOrFailed() - - - task: PublishBuildArtifact@1 - displayName: Publish package artifacts - inputs: - PathtoPublish: $(build.sourcesdirectory)\package - ArtifactName: Package - condition: succeededOrFailed() - job: Linux pool: