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

Update ReSharper.SDK to 2021.1.2 #70

Merged
merged 5 commits into from
May 23, 2021
Merged

Update ReSharper.SDK to 2021.1.2 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49b700d
Update ReSharper.SDK version to 2021.1.2
rayphi May 4, 2021
9f04897
Add mentioned workaround from https://youtrack.jetbrains.com/issue/RS…
rayphi May 5, 2021
2fb1cbe
Resolved using of obsolete method
rayphi May 5, 2021
cee3067
Resolved another using of obsolete method
rayphi May 5, 2021
4eddf83
bump release version
rayphi May 5, 2021
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
15 changes: 8 additions & 7 deletions Project/Src/InstallSupport/TestCop.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Resharper.TestCop.R9</id>
<metadata>
<id>Resharper.TestCop.R9</id>
<version>0.0.0-internal</version>

<title>TestCop for ReSharper 2020.3</title>
<authors>Alcaeus</authors>
<title>TestCop for ReSharper 2021.1</title>
<authors>Alcaeus</authors>
<description>Easily switch between unit tests and code. Create missing associated files. Includes highlightings and test templates to keep test projects neat and tidy. Works with NUnit, MSTest, xUnit ...</description>
<releaseNotes>
1.10.13.1 R#2021.1 Recompiled
1.10.12.1 R#2020.3 Recompiled
1.10.11.2 bug fix for R# option severity screen
1.10.11.1 R#2020.2 Recompiled
Expand Down Expand Up @@ -76,8 +77,8 @@
<iconUrl>https://raw.githubusercontent.com/testcop/Resharper.TestCop/master/Project/Src/TestCop.Plugin/resources/agent48x48.png</iconUrl>
<icon>images\agent48x48.png</icon>
<copyright>Copyright &#x00A9; 2013-2018</copyright>
<dependencies>
<dependency id="Wave" version="[$WAVEID$.0.0]"/>
<dependencies>
<dependency id="Wave" version="[$WAVEID$.0.0]"/>
</dependencies>
<tags>resharper unittest xunit nunit mstest tdd c# template</tags>
</metadata>
Expand All @@ -87,5 +88,5 @@
<file src="Resharper.TestCop.pdb" target="dotFiles\" />
<file src="..\..\..\ResharperTemplates\templates.DotSettings"
target="dotFiles\Extensions\Resharper.TestCop.R9\settings\" />
</files>
</files>
</package>
Binary file removed Project/Src/TestCop.Plugin.Tests/Hunspellx64.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Project/Src/TestCop.Plugin.Tests/Hunspellx86.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Project/Src/TestCop.Plugin.Tests/ProjectAnalysisElementProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace TestCop.Plugin.Tests
{
[TestFixture]
class ProjectAnalysisElementProcessorTests
public class ProjectAnalysisElementProcessorTests
{
[Test]
public void IsNotInDirectoryTest()
Expand Down
17 changes: 14 additions & 3 deletions Project/Src/TestCop.Plugin.Tests/RenameRefactoring/RenameTestFilesTooRefactoringTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

namespace TestCop.Plugin.Tests.RenameRefactoring
{
using System.Collections.Generic;

[TestFixture]
public abstract class RenameTestFilesTooRefactoringTestBase : BaseTest
{
Expand Down Expand Up @@ -55,7 +57,8 @@ public void DoRenameTest(string testFile, int typeSequenceInFile=1, params strin
var solutionFolder = this.CopyTestDataDirectoryToTemp(lifetime,@"..\..\"+RelativeTestDataPath);
solution = (ISolution)this.SolutionManager.OpenExistingSolution(FileSystemPath.Parse(solutionFolder).Combine(SolutionName));
}
lifetime.AddAction(() => SolutionManager.CloseSolution(solution));

lifetime.OnTermination(() => SolutionManager.CloseSolution(solution));

var findFirstTypeInFile = FindTypeInFile(solution, testFile, typeSequenceInFile);

Expand All @@ -65,7 +68,10 @@ public void DoRenameTest(string testFile, int typeSequenceInFile=1, params strin

Assert.AreEqual(expectedRenamedTests.Length, filesToRename.Count);

expectedRenamedTests.ForEach(expectation=>CollectionAssert.Contains(filesToRename, expectation));
foreach (string expectation in expectedRenamedTests)
{
CollectionAssert.Contains(filesToRename, expectation);
}
}))));
}));
}
Expand All @@ -78,7 +84,12 @@ private static IDeclaredElement FindTypeInFile(ISolution solution, string testFi

if (projectFile == null)
{
solution.GetAllProjects().SelectMany(p => p.GetAllProjectFiles()).ForEach(p=>Debug.WriteLine(p.GetPresentableProjectPath()));
IEnumerable<IProjectFile> projectFiles = solution.GetAllProjects().SelectMany(p => p.GetAllProjectFiles());

foreach (IProjectFile file in projectFiles)
{
Debug.WriteLine(file.GetPresentableProjectPath());
}
throw new Exception("Whilst configuring test I didn't find project item: "+testFile);
}

Expand Down
482 changes: 274 additions & 208 deletions Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Project/Src/TestCop.Plugin.Tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,14 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
Loading