Merge pull request #18 from OsirisTerje/update

Update
OsirisTerje · Oct 28, 2021 · 8d908fb · 8d908fb
2 parents 82d43fa + 3a7b84e
commit 8d908fb
Show file tree

Hide file tree

Showing 39 changed files with 437 additions and 1,820 deletions.
diff --git a/.gitignore b/.gitignore
@@ -361,3 +361,22 @@ MigrationBackup/
 .ionide/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
+
+*.tlog
+# Nuget personal access tokens and Credentials
+# nuget.config
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+# Local History for Visual Studio Code
+.history/
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
diff --git a/DIagnosticsTests/DiagnosticsTests.csproj b/DIagnosticsTests/DiagnosticsTests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="0.5.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IFix\IFix.csproj" />

diff --git a/GitIgnoreTests/GitIgnore.cs b/GitIgnoreTests/GitIgnore.cs
@@ -27,7 +27,7 @@ public string GitDirectory
                     string codeBase = Assembly.GetExecutingAssembly().CodeBase;
                     var uri = new UriBuilder(codeBase);
                     string path = Uri.UnescapeDataString(uri.Path);
-                    gitDirectory = Path.Combine(Path.GetDirectoryName(path), @"..\..\..\");
+                    gitDirectory = Path.Combine(Path.GetDirectoryName(path), @"..\..\..\..\");
                 }
                 return gitDirectory;
             }
@@ -94,7 +94,7 @@ public void VerifyWithAddingInfo()
         public void CheckDownload()
         {
             string assemblyLoc = Assembly.GetExecutingAssembly().Location;
-            string currentPath = Path.GetFullPath(Path.Combine(assemblyLoc, @"../../../"));
+            string currentPath = Path.GetFullPath(Path.Combine(assemblyLoc, @"../../../../"));
 
             var sut = new IFix.GitIgnore(currentPath);
 
@@ -151,7 +151,7 @@ public void VerifyAddMissing2()
         public void FindMyOwnGitRepo()
         {
             var sut = new IFix.GitIgnore(GitDirectory);
-            Assert.That(sut.Repositories.Count(), Is.EqualTo(1), "Can't find my own repo");
+            Assert.That(sut.Repositories.Count(), Is.EqualTo(1), $"Can't find my own repo at {GitDirectory}");
             string file = sut.Repositories.First().File;
             Assert.That(File.Exists(file), "No gitignore file");
         }

diff --git a/GitIgnoreTests/GitIgnoreTests.csproj b/GitIgnoreTests/GitIgnoreTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyTitle>GitIgnoreTests</AssemblyTitle>
     <Product>GitIgnoreTests</Product>
     <Copyright>Copyright © 2014  Terje Sandstrom</Copyright>
@@ -37,9 +37,9 @@
     <ProjectReference Include="..\IntegrationTest\IntegrationTest.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
   </ItemGroup>
 </Project>
diff --git a/IFix.Setup/Wix.Generated.wxs b/IFix.Setup/Wix.Generated.wxs
@@ -47,6 +47,51 @@
                 <Component Id="cmp759E3608DFC25556A42E885036A5F2F7" Guid="*">
                     <File Id="filD6912FB8419F3F8BD4D13572569CE6AB" KeyPath="yes" Source="$(var.AppProjectDir)\net48\IFix.pdb" />
                 </Component>
+                <Directory Id="dirDE2BB180E4E534479C16462AA60EF961" Name="publish">
+                    <Component Id="cmpA546F46AF7683A093EF4E2D51F6B70FA" Guid="*">
+                        <File Id="fil3E7D622D9719F9093DD240743C5BEF25" KeyPath="yes" Source="$(var.AppProjectDir)\net48\publish\FluentCommandLineParser.dll" />
+                    </Component>
+                    <Component Id="cmp7D94AB709ACB69D24177275DD59D6FC7" Guid="*">
+                        <File Id="filA5477C2C2DCE9955B81DA84127C24D91" KeyPath="yes" Source="$(var.AppProjectDir)\net48\publish\IFix.exe" />
+                    </Component>
+                    <Component Id="cmp82819C9C24ABA27C27F0F9054EB520D8" Guid="*">
+                        <File Id="fil5FC96769CDFDBDA7DC0D0FABEFFF98CD" KeyPath="yes" Source="$(var.AppProjectDir)\net48\publish\IFix.exe.config" />
+                    </Component>
+                    <Component Id="cmpD98F54D3DC2A0AA18A7614E4F7D374BD" Guid="*">
+                        <File Id="fil0F1ABDB966A3140A215CE462B63AF38C" KeyPath="yes" Source="$(var.AppProjectDir)\net48\publish\IFix.pdb" />
+                    </Component>
+                </Directory>
+            </Directory>
+            <Directory Id="dirFCB0CC680F9C6BF483CD52B74A1A8FFD" Name="net5.0">
+                <Component Id="cmpD5F3C5876885160CAD01EAA2026FE0E9" Guid="*">
+                    <File Id="fil4E940E92EB8F23F210AE4BB8E25E5E5F" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\FluentCommandLineParser.dll" />
+                </Component>
+                <Component Id="cmpC34703C0966CC0479D1243B1FA19E9DD" Guid="*">
+                    <File Id="fil2B915784DBB5CB320646C261B7EAD374" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.deps.json" />
+                </Component>
+                <Component Id="cmp47A92E4B389117E890EE5E8221D2DC47" Guid="*">
+                    <File Id="filBAE294F2D6D4FE326389CFE99519F4BD" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.dll" />
+                </Component>
+                <Component Id="cmpE821C615E17740E700B610918A323EE9" Guid="*">
+                    <File Id="filBEC63BEB108AF1D45D42AFC59C15B910" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.dll.config" />
+                </Component>
+                <Component Id="cmp08634E649BFF50591E891FA13D1DF9BA" Guid="*">
+                    <File Id="fil5AC581F4D20125E47EBCEEE681AA50C1" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.exe" />
+                </Component>
+                <Component Id="cmp6216287021FE22EA5F4DDFB8F4AE85DD" Guid="*">
+                    <File Id="fil7A320CFD8FEDF21AC62ADF2BE121F138" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.pdb" />
+                </Component>
+                <Component Id="cmpBB8D56E51EFE30693B4836632B5440C2" Guid="*">
+                    <File Id="fil0D2A3D04AD988E1D0D07A63DAA8579ED" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.runtimeconfig.dev.json" />
+                </Component>
+                <Component Id="cmp3414A57D16C027300A8A230EBDE0B16E" Guid="*">
+                    <File Id="filA481504A11D60253ACB7E1816EEBDF62" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\IFix.runtimeconfig.json" />
+                </Component>
+                <Directory Id="dirC2F48517ECAD4AEB50D1D98BD85B91AE" Name="ref">
+                    <Component Id="cmp930F820230A3E24A5F561FB4636914FF" Guid="*">
+                        <File Id="fil813E76159060AA67CB86266017B3A185" KeyPath="yes" Source="$(var.AppProjectDir)\net5.0\ref\IFix.dll" />
+                    </Component>
+                </Directory>
             </Directory>
         </DirectoryRef>
     </Fragment>
@@ -66,6 +111,19 @@
             <ComponentRef Id="cmpA55D09A94064AD49E51E58EB45C6B4CC" />
             <ComponentRef Id="cmp2C072381B841A326B60B46C452CE1A34" />
             <ComponentRef Id="cmp759E3608DFC25556A42E885036A5F2F7" />
+            <ComponentRef Id="cmpA546F46AF7683A093EF4E2D51F6B70FA" />
+            <ComponentRef Id="cmp7D94AB709ACB69D24177275DD59D6FC7" />
+            <ComponentRef Id="cmp82819C9C24ABA27C27F0F9054EB520D8" />
+            <ComponentRef Id="cmpD98F54D3DC2A0AA18A7614E4F7D374BD" />
+            <ComponentRef Id="cmpD5F3C5876885160CAD01EAA2026FE0E9" />
+            <ComponentRef Id="cmpC34703C0966CC0479D1243B1FA19E9DD" />
+            <ComponentRef Id="cmp47A92E4B389117E890EE5E8221D2DC47" />
+            <ComponentRef Id="cmpE821C615E17740E700B610918A323EE9" />
+            <ComponentRef Id="cmp08634E649BFF50591E891FA13D1DF9BA" />
+            <ComponentRef Id="cmp6216287021FE22EA5F4DDFB8F4AE85DD" />
+            <ComponentRef Id="cmpBB8D56E51EFE30693B4836632B5440C2" />
+            <ComponentRef Id="cmp3414A57D16C027300A8A230EBDE0B16E" />
+            <ComponentRef Id="cmp930F820230A3E24A5F561FB4636914FF" />
         </ComponentGroup>
     </Fragment>
 </Wix>
diff --git a/IFix.sln b/IFix.sln
@@ -11,8 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitIgnoreTests", "GitIgnore
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{926FE451-32CF-4795-8575-9A5348590EC3}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
 		.github\workflows\blank.yml = .github\workflows\blank.yml
 		CI.runsettings = CI.runsettings
+		.github\workflows\IFix.CI.yml = .github\workflows\IFix.CI.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -22,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiagnosticsTests", "Diagnos
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IFix", "IFix\IFix.csproj", "{22ADA2BA-033A-47E0-AD83-8399775DB135}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "IFix.Setup", "IFix.Setup\IFix.Setup.wixproj", "{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -103,17 +103,6 @@ Global
 		{22ADA2BA-033A-47E0-AD83-8399775DB135}.Release|Mixed Platforms.Build.0 = Release|x86
 		{22ADA2BA-033A-47E0-AD83-8399775DB135}.Release|x86.ActiveCfg = Release|x86
 		{22ADA2BA-033A-47E0-AD83-8399775DB135}.Release|x86.Build.0 = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Debug|x86.ActiveCfg = Debug|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Debug|x86.Build.0 = Debug|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|Any CPU.ActiveCfg = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|Any CPU.Build.0 = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|Mixed Platforms.Build.0 = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|x86.ActiveCfg = Release|x86
-		{2D68840B-5C4F-456A-A55B-9CC59B51F4F8}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/IFix/IFix.csproj b/IFix/IFix.csproj
@@ -1,37 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net48</TargetFramework>
-    <AssemblyTitle>IFix</AssemblyTitle>
-    <Product>IFix</Product>
-    <Copyright>Copyright Terje Sandstrom  2014</Copyright>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include=".gitattributes" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FluentCommandLineParser" Version="1.5.0.20-commands" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
-    <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
-  </ItemGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+        <AssemblyTitle>IFix</AssemblyTitle>
+        <Product>IFix</Product>
+        <PackageId>Hermit.IFix</PackageId>
+        <Copyright>Copyright Terje Sandstrom  2014-2021</Copyright>
+        <AssemblyVersion>3.0.0.0</AssemblyVersion>
+        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.0.0-beta.1</Version>
+        <OutputPath>bin\$(Configuration)\</OutputPath>
+        <PackAsTool>true</PackAsTool>
+        <ToolCommandName>IFix</ToolCommandName>
+        <PackageOutputPath>./nupkg</PackageOutputPath>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <Authors>Terje Sandstrom</Authors>
+        <Description>
+            IFix is a dotnet tool for fixing different issues with Visual Studio, git, testing, solutions and more
+            Install it using:  dotnet tool install --global Hermit.IFix
+            and run it doing:  IFix --help , which will show the relevant options.
+            (To install the beta, use --version 3.0.0-beta.1 or whatever beta number there is)
+        </Description>
+        <PackageProjectUrl>https://github.com/OsirisTerje/Ifix</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/OsirisTerje/Ifix</RepositoryUrl>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>pdbonly</DebugType>
+    </PropertyGroup>
+    <ItemGroup>
+        <EmbeddedResource Include=".gitattributes" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="CommandLineParser" Version="2.8.0" />
+        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
+        <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
+        <Compile Remove="obj\x86\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
+        <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
+        <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
+        <Compile Remove="obj\x86\Release\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
+    </ItemGroup>
 </Project>
diff --git a/IFix/NugetConsolidate.cs b/IFix/NugetConsolidate.cs
@@ -5,9 +5,14 @@
 
 namespace IFix
 {
-    public class NugetConsolidate
+    public interface INugetConsolidate
     {
-        private List<NugetPackage> NugetPackages { get; } = new List<NugetPackage>();
+        int Execute(NugetConsolidateCommands commands);
+    }
+
+    public class NugetConsolidateOld : INugetConsolidate
+    {
+        private List<NugetPackage> NugetPackages { get; } = new();
 
         public int Execute(NugetConsolidateCommands commands)
         {
@@ -99,10 +104,17 @@ void Update(string project, string package, string version)
         }
     }
 
+    public class NugetConsolidate : INugetConsolidate
+    {
+        public int Execute(NugetConsolidateCommands commands)
+        {
+            return 0;
+        }
+    }
+
 
 
 
-
 
 }