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.

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

Various clean up #2758

Merged
merged 3 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .nuget/nuget.exe
Binary file not shown.
12 changes: 6 additions & 6 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ <h2>Generate code from your database</h2>
<a href="#" class="image"><img src="images/pic03.png" alt="" data-position="25% 25%" /></a>
<div class="content">
<div class="inner">
<h2>Manage migrations</h2>
<p>Manage migration directly from the Visual Studio UI</p>
<h2>Database and SQL Project Tools</h2>
<p>Generate code and diagrams from your database and SQL Projects</p>
<ul class="actions">
<li><a href="#two" class="button scrolly">Learn more</a></li>
</ul>
Expand All @@ -97,8 +97,8 @@ <h3>Reverse Engineering</h3>
</section>
<section>
<span class="icon major fa-lock"></span>
<h3>Migrations Tool</h3>
<p>Manage EF Core Migrations in the project, get migration status, add migration and update the database to keep your model and database in sync.</p>
<h3>Database Tools</h3>
<p>Generate DBContext mapping code directly from your SQL Project. Generate E/R diagrams.</p>
</section>
<section>
<span class="icon major fa-cog"></span>
Expand All @@ -118,7 +118,7 @@ <h3>Stored procedures and fuctions</h3>
<section>
<span class="icon major fa-diamond"></span>
<h3>Customize generated code</h3>
<p>Customize the generated code further using Handlebars templates.</p>
<p>Customize the generated code further using T4 and Handlebars templates.</p>
</section>
</div>
<ul class="actions">
Expand All @@ -140,7 +140,7 @@ <h3>Downloads</h3>
<ul class="inner">
<li><a href="https://marketplace.visualstudio.com/items?itemName=ErikEJ.EFCorePowerTools" >EF Core Power Tools</a></li>
<li><a href="https://www.vsixgallery.com/extension/f4c4712c-ceae-4803-8e52-0e2049d5de9f" >Daily build</a></li>
<li><a href="https://www.nuget.org/packages/EntityFrameworkCore.SqlServerCompact40/" >Entity Framework 6 provider for SQL Server using Microsoft.Data.SqlClient</a></li>
<li><a href="https://www.nuget.org/packages/Microsoft.EntityFramework.SqlServer/" >Entity Framework 6 provider for SQL Server using Microsoft.Data.SqlClient</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions src/Core/RevEng.Core.90/RevEng.Core.90.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.HierarchyId" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.2.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.2" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="9.23.60" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="9.0.0-preview.2.efcore.9.0.0" />
<PackageReference Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="9.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.2" />
<PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.2" />
<PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.4.92" />
<PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.5.57" />
<PackageReference Include="System.ComponentModel.Composition" Version="9.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Directory.Build.Props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.30.0.95878">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.4.0.108396">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
1 change: 1 addition & 0 deletions src/GUI/EFCorePowerTools/GlobalSuppressions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
using System.Diagnostics.CodeAnalysis;

[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "Generated by tooling")]
[assembly: SuppressMessage("Minor Code Smell", "S2325:Methods and properties that don't access instance data should be static", Justification = "Will do this later")]
2 changes: 1 addition & 1 deletion src/GUI/RevEng.Shared/Providers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public static List<NuGetPackage> GetNeededPackages(DatabaseType databaseType, bo
pkgVersion = "8.0.11";
break;
case CodeGenerationMode.EFCore9:
pkgVersion = "9.0.1";
pkgVersion = "9.0.2";
break;

default: throw new NotImplementedException();
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/Shared/Extensions/ProjectExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ private static async Task<string> GetTargetFrameworkMonikersAsync(Project projec
{
string result = null;

project.GetItemInfo(out IVsHierarchy hierarchy, out uint itemId, out _);
project.GetItemInfo(out IVsHierarchy hierarchy, out uint _, out _);

await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();

Expand Down
2 changes: 1 addition & 1 deletion src/GUI/Shared/Handlers/ModelAnalyzerHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public async System.Threading.Tasks.Task GenerateAsync(string outputPath, Projec
return;
}

if (!Version.TryParse(result.Item2, out Version version))
if (!Version.TryParse(result.Item2, out Version _))
{
VSHelper.ShowError(string.Format(ModelAnalyzerLocale.CurrentEFCoreVersion, result.Item2));
if (!result.Item1)
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/Shared/Helpers/VsDataHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ internal static async System.Threading.Tasks.Task<bool> IsDdexProviderInstalledA
{
var providerManager = await VS.GetServiceAsync<IVsDataProviderManager, IVsDataProviderManager>();
return providerManager != null &&
providerManager.Providers.TryGetValue(id, out IVsDataProvider provider);
providerManager.Providers.TryGetValue(id, out IVsDataProvider _);
}
catch
{
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/UnitTests/ResultDeserializerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void ParseResultWithError()
// Assert
}

private string ReadAllText(string file)
private static string ReadAllText(string file)
{
return File.ReadAllText(Path.Combine(TestContext.CurrentContext.TestDirectory, file));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public void CancelEditing_Execute()
ClassicAssert.AreSame(vm.Name, vm.NewName);
}

private ColumnInformationViewModel CreateViewModel()
private static ColumnInformationViewModel CreateViewModel()
{
var messenger = new Mock<IMessenger>();
messenger.SetupAllProperties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void PropertyChanged_IsSelected_PartialObjectSelection()
ClassicAssert.IsNull(vm.IsSelected);
}

private TableInformationViewModel CreateTable(string name)
private static TableInformationViewModel CreateTable(string name)
{
var messenger = new Mock<IMessenger>();
messenger.SetupAllProperties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,14 @@ public void CancelEditing_Execute()
ClassicAssert.AreSame(vm.Name, vm.NewName);
}

private TableInformationViewModel CreateViewModel()
private static TableInformationViewModel CreateViewModel()
{
var messenger = new Mock<IMessenger>();
messenger.SetupAllProperties();
return new TableInformationViewModel(messenger.Object);
}

private ColumnInformationViewModel CreateColumnViewModel(string name, bool isPrimaryKey = false, bool isForeignKey = false)
private static ColumnInformationViewModel CreateColumnViewModel(string name, bool isPrimaryKey = false, bool isForeignKey = false)
{
var messenger = new Mock<IMessenger>();
messenger.SetupAllProperties();
Expand Down
108 changes: 0 additions & 108 deletions tools/appveyor.yml

This file was deleted.