Remove 'Fritz' from the project, namespace, and NuGet package names (#62

) * Sorry Jeff. * Delete Fritz.InstantAPIs.sln Not sure why the rename left the original but ok * Fixes Github workflow * Adds stashed files skipped during last commit * Update .gitignore Adds .idea to .gitignore * Delete .idea directory
csharpfritz · May 17, 2022 · 5fb5a53 · 5fb5a53
1 parent d3f053e
commit 5fb5a53
Show file tree

Hide file tree

Showing 60 changed files with 107 additions and 99 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\dev\Fritz.InstantAPIs codebase based on best match to current usage at 2/26/2022
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\dev\InstantAPIs codebase based on best match to current usage at 2/26/2022
 # You can modify the rules from these initially generated values to suit your own policies
 # You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
 [*.cs]

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -58,7 +58,7 @@ jobs:
       run: dotnet test
 
     - name: Pack
-      run: dotnet pack Fritz.InstantAPIs/Fritz.InstantAPIs.csproj --configuration Release -o finalpackage --no-build
+      run: dotnet pack InstantAPIs/InstantAPIs.csproj --configuration Release -o finalpackage --no-build
 
     - name: Publish artifact
       uses: actions/upload-artifact@master
@@ -70,7 +70,7 @@ jobs:
       id: set_proj_version
       shell: pwsh
       run: |
-        [xml]$nuspec = Get-Content Fritz.InstantAPIs/Fritz.InstantAPIs.csproj
+        [xml]$nuspec = Get-Content InstantAPIs/InstantAPIs.csproj
         $version=$nuspec.project.propertygroup.version
         $relnotes=$nuspec.project.propertygroup.packagereleasenotes
         echo "PKG_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

diff --git a/.github/workflows/buildAndDeploy.yaml b/.github/workflows/buildAndDeploy.yaml
@@ -49,7 +49,7 @@ jobs:
       run: dotnet test
 
     - name: Pack
-      run: dotnet pack Fritz.InstantAPIs/Fritz.InstantAPIs.csproj --configuration Release -o finalpackage --no-build
+      run: dotnet pack InstantAPIs/InstantAPIs.csproj --configuration Release -o finalpackage --no-build
 
     - name: Publish artifact
       uses: actions/upload-artifact@master
@@ -61,7 +61,7 @@ jobs:
       id: set_proj_version
       shell: pwsh
       run: |
-        [xml]$nuspec = Get-Content Fritz.InstantAPIs/Fritz.InstantAPIs.csproj
+        [xml]$nuspec = Get-Content InstantAPIs/InstantAPIs.csproj
         $version=$nuspec.project.propertygroup.version
         $relnotes=$nuspec.project.propertygroup.packagereleasenotes
         echo "PKG_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
+.idea/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,7 +30,7 @@ The folders are a basic structure which will change as needed to support the pro
 
 ```
 
-  Fritz.InstantAPIs               The project code.
+  InstantAPIs                     The project code.
   WorkingApi                      The project to prototype and manually test the functionality being developed.
 
 ```

diff --git a/Fritz.InstantAPIs.Generators.Helpers/Included.cs b/Fritz.InstantAPIs.Generators.Helpers/Included.cs
diff --git a/...InstanceAPIGeneratorConfigBuilderTests.cs → ...InstanceAPIGeneratorConfigBuilderTests.cs b/...InstanceAPIGeneratorConfigBuilderTests.cs → ...InstanceAPIGeneratorConfigBuilderTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace Fritz.InstantAPIs.Generators.Helpers.Tests;
+namespace InstantAPIs.Generators.Helpers.Tests;
 
 public static class InstanceAPIGeneratorConfigBuilderTests
 {

diff --git a/...stantAPIs.Generators.Helpers.Tests.csproj → ...stantAPIs.Generators.Helpers.Tests.csproj b/...stantAPIs.Generators.Helpers.Tests.csproj → ...stantAPIs.Generators.Helpers.Tests.csproj
@@ -13,6 +13,6 @@
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Fritz.InstantAPIs.Generators.Helpers\Fritz.InstantAPIs.Generators.Helpers.csproj" />
+		<ProjectReference Include="..\InstantAPIs.Generators.Helpers\InstantAPIs.Generators.Helpers.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/...erators.Helpers.Tests/TableConfigTests.cs → ...erators.Helpers.Tests/TableConfigTests.cs b/...erators.Helpers.Tests/TableConfigTests.cs → ...erators.Helpers.Tests/TableConfigTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace Fritz.InstantAPIs.Generators.Helpers.Tests
+namespace InstantAPIs.Generators.Helpers.Tests
 {
 	public static class TableConfigTests
 	{

diff --git a/...APIs.Generators.Helpers/ApisToGenerate.cs → ...APIs.Generators.Helpers/ApisToGenerate.cs b/...APIs.Generators.Helpers/ApisToGenerate.cs → ...APIs.Generators.Helpers/ApisToGenerate.cs
@@ -1,4 +1,4 @@
-namespace Fritz.InstantAPIs.Generators.Helpers
+namespace InstantAPIs.Generators.Helpers
 {
 	[Flags]
 	public enum ApisToGenerate

diff --git a/InstantAPIs.Generators.Helpers/Included.cs b/InstantAPIs.Generators.Helpers/Included.cs
@@ -0,0 +1,7 @@
+namespace InstantAPIs.Generators.Helpers
+{
+	public enum Included
+	{
+		Yes, No
+	}
+}
diff --git a/...ors.Helpers/InstanceAPIGeneratorConfig.cs → ...ors.Helpers/InstanceAPIGeneratorConfig.cs b/...ors.Helpers/InstanceAPIGeneratorConfig.cs → ...ors.Helpers/InstanceAPIGeneratorConfig.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Fritz.InstantAPIs.Generators.Helpers
+namespace InstantAPIs.Generators.Helpers
 {
 	public class InstanceAPIGeneratorConfig<T>
 		where T : struct, Enum

diff --git a/...pers/InstanceAPIGeneratorConfigBuilder.cs → ...pers/InstanceAPIGeneratorConfigBuilder.cs b/...pers/InstanceAPIGeneratorConfigBuilder.cs → ...pers/InstanceAPIGeneratorConfigBuilder.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Fritz.InstantAPIs.Generators.Helpers
+namespace InstantAPIs.Generators.Helpers
 {
 	public sealed class InstanceAPIGeneratorConfigBuilder<T>
 		where T : struct, Enum

diff --git a/...itz.InstantAPIs.Generators.Helpers.csproj → ...ers/InstantAPIs.Generators.Helpers.csproj b/...itz.InstantAPIs.Generators.Helpers.csproj → ...ers/InstantAPIs.Generators.Helpers.csproj
diff --git a/...lpers/InstantAPIsForDbContextAttribute.cs → ...lpers/InstantAPIsForDbContextAttribute.cs b/...lpers/InstantAPIsForDbContextAttribute.cs → ...lpers/InstantAPIsForDbContextAttribute.cs
@@ -1,4 +1,4 @@
-namespace Fritz.InstantAPIs.Generators.Helpers
+namespace InstantAPIs.Generators.Helpers
 {
 	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
 	public sealed class InstantAPIsForDbContextAttribute

diff --git a/...antAPIs.Generators.Helpers/TableConfig.cs → ...antAPIs.Generators.Helpers/TableConfig.cs b/...antAPIs.Generators.Helpers/TableConfig.cs → ...antAPIs.Generators.Helpers/TableConfig.cs
@@ -1,4 +1,4 @@
-namespace Fritz.InstantAPIs.Generators.Helpers
+namespace InstantAPIs.Generators.Helpers
 {
 	public sealed class TableConfig<T>
 		where T : struct, Enum

diff --git a/...harpIncrementalSourceGeneratorVerifier.cs → ...harpIncrementalSourceGeneratorVerifier.cs b/...harpIncrementalSourceGeneratorVerifier.cs → ...harpIncrementalSourceGeneratorVerifier.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Fritz.InstantAPIs.Generators.Tests;
+namespace InstantAPIs.Generators.Tests;
 
 // All of this code was grabbed from Refit
 // (https://github.com/reactiveui/refit/pull/1216/files)

diff --git a/...ators.Tests/DbContextAPIGeneratorTests.cs → ...ators.Tests/DbContextAPIGeneratorTests.cs b/...ators.Tests/DbContextAPIGeneratorTests.cs → ...ators.Tests/DbContextAPIGeneratorTests.cs
@@ -1,12 +1,12 @@
-using Fritz.InstantAPIs.Generators.Diagnostics;
+using InstantAPIs.Generators.Diagnostics;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Fritz.InstantAPIs.Generators.Tests;
+namespace InstantAPIs.Generators.Tests;
 
 public static class DbContextAPIGeneratorTests
 {
@@ -18,7 +18,7 @@ public static class DbContextAPIGeneratorTests
 	public static async Task GenerateWhenDbContextExists(string idType, string idParseMethod)
 	{
 		var code =
-$@"using Fritz.InstantAPIs.Generators.Helpers;
+$@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 using System;
@@ -39,7 +39,7 @@ public class Contact
 	}}
 }}";
 		var generatedCode =
-$@"using Fritz.InstantAPIs.Generators.Helpers;
+$@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -162,7 +162,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenMultipleDbContextsExists()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 using System;
@@ -188,7 +188,7 @@ public class Contact
 	}
 }";
 		var customerGeneratedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -259,7 +259,7 @@ public static IEndpointRouteBuilder MapCustomerContextToAPIs(this IEndpointRoute
 ";
 
 		var personGeneratedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -342,7 +342,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenIdentifierUsesKeyAttribute()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 using System;
@@ -365,7 +365,7 @@ public class Contact
 	}
 }";
 		var generatedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -488,7 +488,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenTableTypeNamespaceIsDifferentThanDbContextNamespace()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 using MyTableTypes;
@@ -512,7 +512,7 @@ public class Contact
 	}
 }";
 		var generatedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -616,7 +616,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenTypeGivenInAttributeIsNotDbContext()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 
 [assembly: InstantAPIsForDbContext(typeof(string))]";
 
@@ -632,7 +632,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenDbContextExistsAndDoesNotHaveIdProperty()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 
@@ -651,7 +651,7 @@ public class Contact
 	}
 }";
 		var generatedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -730,7 +730,7 @@ await TestAssistants.RunAsync(code,
 	public static async Task GenerateWhenMultipleAttributeDefinitionsExist()
 	{
 		var code =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.EntityFrameworkCore;
 using MyApplication;
 
@@ -750,7 +750,7 @@ public class Contact
 	}
 }";
 		var generatedCode =
-@"using Fritz.InstantAPIs.Generators.Helpers;
+@"using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/...ics/DuplicateDefinitionDiagnosticTests.cs → ...ics/DuplicateDefinitionDiagnosticTests.cs b/...ics/DuplicateDefinitionDiagnosticTests.cs → ...ics/DuplicateDefinitionDiagnosticTests.cs
@@ -1,9 +1,9 @@
-using Fritz.InstantAPIs.Generators.Diagnostics;
+using InstantAPIs.Generators.Diagnostics;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
 
-namespace Fritz.InstantAPIs.Generators.Tests.Diagnostics;
+namespace InstantAPIs.Generators.Tests.Diagnostics;
 
 public static class DuplicateDefinitionDiagnosticTests
 {

diff --git a/...agnostics/NotADbContextDiagnosticTests.cs → ...agnostics/NotADbContextDiagnosticTests.cs b/...agnostics/NotADbContextDiagnosticTests.cs → ...agnostics/NotADbContextDiagnosticTests.cs
@@ -1,12 +1,12 @@
-using Fritz.InstantAPIs.Generators.Diagnostics;
+using InstantAPIs.Generators.Diagnostics;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis;
 using System;
 using Xunit;
 using System.Linq;
 
-namespace Fritz.InstantAPIs.Generators.Tests.Diagnostics;
+namespace InstantAPIs.Generators.Tests.Diagnostics;
 
 public static class NotADbContextDiagnosticTests
 {

diff --git a/...Fritz.InstantAPIs.Generators.Tests.csproj → ...Tests/InstantAPIs.Generators.Tests.csproj b/...Fritz.InstantAPIs.Generators.Tests.csproj → ...Tests/InstantAPIs.Generators.Tests.csproj
@@ -21,7 +21,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Fritz.InstantAPIs.Generators.Helpers\Fritz.InstantAPIs.Generators.Helpers.csproj" />
-		<ProjectReference Include="..\Fritz.InstantAPIs.Generators\Fritz.InstantAPIs.Generators.csproj" />
+		<ProjectReference Include="..\InstantAPIs.Generators.Helpers\InstantAPIs.Generators.Helpers.csproj" />
+		<ProjectReference Include="..\InstantAPIs.Generators\InstantAPIs.Generators.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/...ntAPIs.Generators.Tests/TestAssistants.cs → ...ntAPIs.Generators.Tests/TestAssistants.cs b/...ntAPIs.Generators.Tests/TestAssistants.cs → ...ntAPIs.Generators.Tests/TestAssistants.cs
@@ -1,4 +1,4 @@
-using Fritz.InstantAPIs.Generators.Helpers;
+using InstantAPIs.Generators.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -15,7 +15,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Fritz.InstantAPIs.Generators.Tests;
+namespace InstantAPIs.Generators.Tests;
 
 using GeneratorTest = CSharpIncrementalSourceGeneratorVerifier<DbContextAPIGenerator>;
 

diff --git a/...enerators/Builders/DbContextAPIBuilder.cs → ...enerators/Builders/DbContextAPIBuilder.cs b/...enerators/Builders/DbContextAPIBuilder.cs → ...enerators/Builders/DbContextAPIBuilder.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Fritz.InstantAPIs.Generators.Builders
+namespace InstantAPIs.Generators.Builders
 {
 	public static class DbContextAPIBuilder
 	{
@@ -43,7 +43,7 @@ public static class DbContextAPIBuilder
 				var namespaces = new NamespaceGatherer();
 				namespaces.Add("System");
 				namespaces.Add("System.Collections.Generic");
-				namespaces.Add("Fritz.InstantAPIs.Generators.Helpers");
+				namespaces.Add("InstantAPIs.Generators.Helpers");
 				namespaces.Add("Microsoft.EntityFrameworkCore");
 				namespaces.Add("Microsoft.Extensions.Logging");
 				namespaces.Add("Microsoft.Extensions.Logging.Abstractions");

diff --git a/...IEndpointRouteBuilderExtensionsBuilder.cs → ...IEndpointRouteBuilderExtensionsBuilder.cs b/...IEndpointRouteBuilderExtensionsBuilder.cs → ...IEndpointRouteBuilderExtensionsBuilder.cs
@@ -2,7 +2,7 @@
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 
-namespace Fritz.InstantAPIs.Generators.Builders
+namespace InstantAPIs.Generators.Builders
 {
 	internal static class IEndpointRouteBuilderExtensionsBuilder
 	{

diff --git a/....Generators/Builders/TablesEnumBuilder.cs → ....Generators/Builders/TablesEnumBuilder.cs b/....Generators/Builders/TablesEnumBuilder.cs → ....Generators/Builders/TablesEnumBuilder.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Fritz.InstantAPIs.Generators.Builders
+namespace InstantAPIs.Generators.Builders
 {
 	internal sealed class TablesEnumBuilder
 	{

diff --git a/...tAPIs.Generators/DbContextAPIGenerator.cs → ...tAPIs.Generators/DbContextAPIGenerator.cs b/...tAPIs.Generators/DbContextAPIGenerator.cs → ...tAPIs.Generators/DbContextAPIGenerator.cs
@@ -1,13 +1,13 @@
-using Fritz.InstantAPIs.Generators.Builders;
-using Fritz.InstantAPIs.Generators.Diagnostics;
+using InstantAPIs.Generators.Builders;
+using InstantAPIs.Generators.Diagnostics;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 
-namespace Fritz.InstantAPIs.Generators;
+namespace InstantAPIs.Generators;
 
 [Generator]
 public sealed class DbContextAPIGenerator
@@ -33,7 +33,7 @@ node is AttributeSyntax attributeNode &&
 			{
 				// Let's do a best guess that it's the attribute we're looking for.
 				if(symbol.ContainingType.Name == "InstantAPIsForDbContextAttribute" && 
-					symbol.ContainingNamespace.ToDisplayString() == "Fritz.InstantAPIs.Generators.Helpers")
+					symbol.ContainingNamespace.ToDisplayString() == "InstantAPIs.Generators.Helpers")
 				{
 					// Find the attribute data for the node.
 					var attributeData = model.Compilation.Assembly.GetAttributes().SingleOrDefault(
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ bld/ @@
     # Visual Studio 2015/2017 cache/options directory
     .vs/
+    .idea/
     # Uncomment if you have tasks that create the project's static files in wwwroot
     #wwwroot/
@@ Expand Down @@