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.

Sign up for GitHub

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

Jump to bottom

Updated for supporting VS 2019 #590 #591

Merged
merged 4 commits into from
Jan 26, 2019
Merged

Updated for supporting VS 2019 #590 #591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c67795
Updated for supporting VS 2019 #590
OsirisTerje Jan 24, 2019
012079f
Add Win RuntimeIdentifiers to the installer project
rprouse Jan 25, 2019
1e7e3cc
Win to win
rprouse Jan 25, 2019
4b53a66
Fix minimum version numbers
OsirisTerje Jan 26, 2019
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
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2017 Charlie Poole, 2014-2017 Terje Sandstrom
Copyright (c) 2011-2019 Charlie Poole, 2014-2019 Terje Sandstrom

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions NUnit3TestAdapter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.ps1 = build.ps1
src\Common.props = src\Common.props
DisableAppDomain.runsettings = DisableAppDomain.runsettings
LICENSE.txt = LICENSE.txt
src\native-assembly\NativeTests.dll = src\native-assembly\NativeTests.dll
NuGet.Config = NuGet.Config
Osiris.Extended.ruleset = Osiris.Extended.ruleset
Expand Down
2 changes: 1 addition & 1 deletion build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var configuration = Argument("configuration", "Release");
// SET PACKAGE VERSION
//////////////////////////////////////////////////////////////////////

var version = "3.12.0";
var version = "3.13.0";
var modifier = "";

var dbgSuffix = configuration == "Debug" ? "-dbg" : "";
Expand Down
Binary file modified src/NUnit3TestAdapterInstall/license.rtf
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions src/NUnit3TestAdapterInstall/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="NUnit.NUnit3TestAdapter" Version="3.12.0.0" Language="en-US" Publisher="Charlie Poole, Terje Sandstrom" />
<Identity Id="NUnit.NUnit3TestAdapter" Version="3.13.0.0" Language="en-US" Publisher="Charlie Poole, Terje Sandstrom" />
<DisplayName>NUnit 3 Test Adapter</DisplayName>
<Description xml:space="preserve">NUnit 3 adapter for running tests in Visual Studio. Works with NUnit 3.x.
For running NUnit 2 tests, use the NUnit 2 adapter.</Description>
Expand All @@ -12,9 +12,9 @@ For running NUnit 2 tests, use the NUnit 2 adapter.</Description>
<Tags>test, Testing, adapter, NUnit, TDD, NUnit3, UnitTesting</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,16.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,16.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,16.0)"/>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)" />
OsirisTerje marked this conversation as resolved.
Show resolved Hide resolved
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
Expand All @@ -23,7 +23,7 @@ For running NUnit 2 tests, use the NUnit 2 adapter.</Description>
<Asset Type="UnitTestExtension" d:Source="File" Path="NUnit3.TestAdapter.dll" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0.25904.2,16.0)" DisplayName=".NET desktop development tools" />
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.8.27729.1,)" DisplayName="Visual Studio core editor" />
OsirisTerje marked this conversation as resolved.
Show resolved Hide resolved
<Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.7.27625.0,)" DisplayName=".NET desktop development tools" />
</Prerequisites>
</PackageManifest>
6 changes: 3 additions & 3 deletions src/NUnitTestAdapter/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyDescription("A package including the NUnit 3 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 TFS server.\r\n \r\nNote that this package ONLY contains the adapter, not the NUnit framework. You must also get the framework. You only need one such package for a solution. \r\n\r\nThe package works with Visual Studio 2012 and newer.\r\n")]
[assembly: AssemblyCompany("NUnit Project")]
[assembly: AssemblyProduct("NUnit3TestAdapter")]
[assembly: AssemblyCopyright("Copyright © 2011-2018 Charlie Poole, 2014-2018 Terje Sandstrom")]
[assembly: AssemblyCopyright("Copyright © 2011-2019 Charlie Poole, 2014-2019 Terje Sandstrom")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: CLSCompliant(false)]
Expand All @@ -21,7 +21,7 @@
[assembly: ComVisible(false)]

[assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")]
[assembly: AssemblyVersion("3.12.0.0")]
[assembly: AssemblyFileVersion("3.12.0.0")]
[assembly: AssemblyVersion("3.13.0.0")]
[assembly: AssemblyFileVersion("3.13.0.0")]

[assembly: InternalsVisibleTo("NUnit.VisualStudio.TestAdapter.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010029b97dea816272cc4ea44cf3cf666f8150d6dfe1274b6c2e6c4d54259b756888ec08ad6dd3ea0f540b30408b948ae5f39cf0c7b210abdec267b367ce1eccab97d5c6c02ee67090827ffd699544fa2add4849b45a1901eac08495bfee0397fba3946ff3912ce0b9a497818e418a77a0c8db4ca1780e7b6f6dd6911395fcc0faba")]