Skip to content

Commit 5fb5a53

Browse files
ScottKaneScottKane
authored
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
1 parent d3f053e commit 5fb5a53

File tree

60 files changed

+107
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+107
-99
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 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
1+
# 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
22
# You can modify the rules from these initially generated values to suit your own policies
33
# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
44
[*.cs]

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: dotnet test
5959

6060
- name: Pack
61-
run: dotnet pack Fritz.InstantAPIs/Fritz.InstantAPIs.csproj --configuration Release -o finalpackage --no-build
61+
run: dotnet pack InstantAPIs/InstantAPIs.csproj --configuration Release -o finalpackage --no-build
6262

6363
- name: Publish artifact
6464
uses: actions/upload-artifact@master
@@ -70,7 +70,7 @@ jobs:
7070
id: set_proj_version
7171
shell: pwsh
7272
run: |
73-
[xml]$nuspec = Get-Content Fritz.InstantAPIs/Fritz.InstantAPIs.csproj
73+
[xml]$nuspec = Get-Content InstantAPIs/InstantAPIs.csproj
7474
$version=$nuspec.project.propertygroup.version
7575
$relnotes=$nuspec.project.propertygroup.packagereleasenotes
7676
echo "PKG_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

‎.github/workflows/buildAndDeploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: dotnet test
5050

5151
- name: Pack
52-
run: dotnet pack Fritz.InstantAPIs/Fritz.InstantAPIs.csproj --configuration Release -o finalpackage --no-build
52+
run: dotnet pack InstantAPIs/InstantAPIs.csproj --configuration Release -o finalpackage --no-build
5353

5454
- name: Publish artifact
5555
uses: actions/upload-artifact@master
@@ -61,7 +61,7 @@ jobs:
6161
id: set_proj_version
6262
shell: pwsh
6363
run: |
64-
[xml]$nuspec = Get-Content Fritz.InstantAPIs/Fritz.InstantAPIs.csproj
64+
[xml]$nuspec = Get-Content InstantAPIs/InstantAPIs.csproj
6565
$version=$nuspec.project.propertygroup.version
6666
$relnotes=$nuspec.project.propertygroup.packagereleasenotes
6767
echo "PKG_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ bld/
3333

3434
# Visual Studio 2015/2017 cache/options directory
3535
.vs/
36+
.idea/
3637
# Uncomment if you have tasks that create the project's static files in wwwroot
3738
#wwwroot/
3839

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The folders are a basic structure which will change as needed to support the pro
3030

3131
```
3232
33-
Fritz.InstantAPIs The project code.
33+
InstantAPIs The project code.
3434
WorkingApi The project to prototype and manually test the functionality being developed.
3535
3636
```

‎Fritz.InstantAPIs.Generators.Helpers/Included.cs

-7
This file was deleted.

‎Fritz.InstantAPIs.Generators.Helpers.Tests/InstanceAPIGeneratorConfigBuilderTests.cs renamed to ‎InstantAPIs.Generators.Helpers.Tests/InstanceAPIGeneratorConfigBuilderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using Xunit;
33

4-
namespace Fritz.InstantAPIs.Generators.Helpers.Tests;
4+
namespace InstantAPIs.Generators.Helpers.Tests;
55

66
public static class InstanceAPIGeneratorConfigBuilderTests
77
{

‎Fritz.InstantAPIs.Generators.Helpers.Tests/Fritz.InstantAPIs.Generators.Helpers.Tests.csproj renamed to ‎InstantAPIs.Generators.Helpers.Tests/InstantAPIs.Generators.Helpers.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</PackageReference>
1414
</ItemGroup>
1515
<ItemGroup>
16-
<ProjectReference Include="..\Fritz.InstantAPIs.Generators.Helpers\Fritz.InstantAPIs.Generators.Helpers.csproj" />
16+
<ProjectReference Include="..\InstantAPIs.Generators.Helpers\InstantAPIs.Generators.Helpers.csproj" />
1717
</ItemGroup>
1818
</Project>

‎Fritz.InstantAPIs.Generators.Helpers.Tests/TableConfigTests.cs renamed to ‎InstantAPIs.Generators.Helpers.Tests/TableConfigTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Xunit;
22

3-
namespace Fritz.InstantAPIs.Generators.Helpers.Tests
3+
namespace InstantAPIs.Generators.Helpers.Tests
44
{
55
public static class TableConfigTests
66
{

‎Fritz.InstantAPIs.Generators.Helpers/ApisToGenerate.cs renamed to ‎InstantAPIs.Generators.Helpers/ApisToGenerate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Fritz.InstantAPIs.Generators.Helpers
1+
namespace InstantAPIs.Generators.Helpers
22
{
33
[Flags]
44
public enum ApisToGenerate

‎InstantAPIs.Generators.Helpers/Included.cs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace InstantAPIs.Generators.Helpers
2+
{
3+
public enum Included
4+
{
5+
Yes, No
6+
}
7+
}

‎Fritz.InstantAPIs.Generators.Helpers/InstanceAPIGeneratorConfig.cs renamed to ‎InstantAPIs.Generators.Helpers/InstanceAPIGeneratorConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Immutable;
22

3-
namespace Fritz.InstantAPIs.Generators.Helpers
3+
namespace InstantAPIs.Generators.Helpers
44
{
55
public class InstanceAPIGeneratorConfig<T>
66
where T : struct, Enum

‎Fritz.InstantAPIs.Generators.Helpers/InstanceAPIGeneratorConfigBuilder.cs renamed to ‎InstantAPIs.Generators.Helpers/InstanceAPIGeneratorConfigBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Immutable;
22

3-
namespace Fritz.InstantAPIs.Generators.Helpers
3+
namespace InstantAPIs.Generators.Helpers
44
{
55
public sealed class InstanceAPIGeneratorConfigBuilder<T>
66
where T : struct, Enum

‎Fritz.InstantAPIs.Generators.Helpers/Fritz.InstantAPIs.Generators.Helpers.csproj renamed to ‎InstantAPIs.Generators.Helpers/InstantAPIs.Generators.Helpers.csproj

File renamed without changes.

‎Fritz.InstantAPIs.Generators.Helpers/InstantAPIsForDbContextAttribute.cs renamed to ‎InstantAPIs.Generators.Helpers/InstantAPIsForDbContextAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Fritz.InstantAPIs.Generators.Helpers
1+
namespace InstantAPIs.Generators.Helpers
22
{
33
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
44
public sealed class InstantAPIsForDbContextAttribute

‎Fritz.InstantAPIs.Generators.Helpers/TableConfig.cs renamed to ‎InstantAPIs.Generators.Helpers/TableConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Fritz.InstantAPIs.Generators.Helpers
1+
namespace InstantAPIs.Generators.Helpers
22
{
33
public sealed class TableConfig<T>
44
where T : struct, Enum

‎Fritz.InstantAPIs.Generators.Tests/CSharpIncrementalSourceGeneratorVerifier.cs renamed to ‎InstantAPIs.Generators.Tests/CSharpIncrementalSourceGeneratorVerifier.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System;
88
using System.Collections.Generic;
99

10-
namespace Fritz.InstantAPIs.Generators.Tests;
10+
namespace InstantAPIs.Generators.Tests;
1111

1212
// All of this code was grabbed from Refit
1313
// (https://github.com/reactiveui/refit/pull/1216/files)

‎Fritz.InstantAPIs.Generators.Tests/DbContextAPIGeneratorTests.cs renamed to ‎InstantAPIs.Generators.Tests/DbContextAPIGeneratorTests.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using Fritz.InstantAPIs.Generators.Diagnostics;
1+
using InstantAPIs.Generators.Diagnostics;
22
using Microsoft.CodeAnalysis;
33
using Microsoft.CodeAnalysis.Testing;
44
using System;
55
using System.Linq;
66
using System.Threading.Tasks;
77
using Xunit;
88

9-
namespace Fritz.InstantAPIs.Generators.Tests;
9+
namespace InstantAPIs.Generators.Tests;
1010

1111
public static class DbContextAPIGeneratorTests
1212
{
@@ -18,7 +18,7 @@ public static class DbContextAPIGeneratorTests
1818
public static async Task GenerateWhenDbContextExists(string idType, string idParseMethod)
1919
{
2020
var code =
21-
$@"using Fritz.InstantAPIs.Generators.Helpers;
21+
$@"using InstantAPIs.Generators.Helpers;
2222
using Microsoft.EntityFrameworkCore;
2323
using MyApplication;
2424
using System;
@@ -39,7 +39,7 @@ public class Contact
3939
}}
4040
}}";
4141
var generatedCode =
42-
$@"using Fritz.InstantAPIs.Generators.Helpers;
42+
$@"using InstantAPIs.Generators.Helpers;
4343
using Microsoft.AspNetCore.Builder;
4444
using Microsoft.AspNetCore.Http;
4545
using Microsoft.AspNetCore.Mvc;
@@ -162,7 +162,7 @@ await TestAssistants.RunAsync(code,
162162
public static async Task GenerateWhenMultipleDbContextsExists()
163163
{
164164
var code =
165-
@"using Fritz.InstantAPIs.Generators.Helpers;
165+
@"using InstantAPIs.Generators.Helpers;
166166
using Microsoft.EntityFrameworkCore;
167167
using MyApplication;
168168
using System;
@@ -188,7 +188,7 @@ public class Contact
188188
}
189189
}";
190190
var customerGeneratedCode =
191-
@"using Fritz.InstantAPIs.Generators.Helpers;
191+
@"using InstantAPIs.Generators.Helpers;
192192
using Microsoft.AspNetCore.Builder;
193193
using Microsoft.AspNetCore.Http;
194194
using Microsoft.AspNetCore.Mvc;
@@ -259,7 +259,7 @@ public static IEndpointRouteBuilder MapCustomerContextToAPIs(this IEndpointRoute
259259
";
260260

261261
var personGeneratedCode =
262-
@"using Fritz.InstantAPIs.Generators.Helpers;
262+
@"using InstantAPIs.Generators.Helpers;
263263
using Microsoft.AspNetCore.Builder;
264264
using Microsoft.AspNetCore.Http;
265265
using Microsoft.AspNetCore.Mvc;
@@ -342,7 +342,7 @@ await TestAssistants.RunAsync(code,
342342
public static async Task GenerateWhenIdentifierUsesKeyAttribute()
343343
{
344344
var code =
345-
@"using Fritz.InstantAPIs.Generators.Helpers;
345+
@"using InstantAPIs.Generators.Helpers;
346346
using Microsoft.EntityFrameworkCore;
347347
using MyApplication;
348348
using System;
@@ -365,7 +365,7 @@ public class Contact
365365
}
366366
}";
367367
var generatedCode =
368-
@"using Fritz.InstantAPIs.Generators.Helpers;
368+
@"using InstantAPIs.Generators.Helpers;
369369
using Microsoft.AspNetCore.Builder;
370370
using Microsoft.AspNetCore.Http;
371371
using Microsoft.AspNetCore.Mvc;
@@ -488,7 +488,7 @@ await TestAssistants.RunAsync(code,
488488
public static async Task GenerateWhenTableTypeNamespaceIsDifferentThanDbContextNamespace()
489489
{
490490
var code =
491-
@"using Fritz.InstantAPIs.Generators.Helpers;
491+
@"using InstantAPIs.Generators.Helpers;
492492
using Microsoft.EntityFrameworkCore;
493493
using MyApplication;
494494
using MyTableTypes;
@@ -512,7 +512,7 @@ public class Contact
512512
}
513513
}";
514514
var generatedCode =
515-
@"using Fritz.InstantAPIs.Generators.Helpers;
515+
@"using InstantAPIs.Generators.Helpers;
516516
using Microsoft.AspNetCore.Builder;
517517
using Microsoft.AspNetCore.Http;
518518
using Microsoft.AspNetCore.Mvc;
@@ -616,7 +616,7 @@ await TestAssistants.RunAsync(code,
616616
public static async Task GenerateWhenTypeGivenInAttributeIsNotDbContext()
617617
{
618618
var code =
619-
@"using Fritz.InstantAPIs.Generators.Helpers;
619+
@"using InstantAPIs.Generators.Helpers;
620620
621621
[assembly: InstantAPIsForDbContext(typeof(string))]";
622622

@@ -632,7 +632,7 @@ await TestAssistants.RunAsync(code,
632632
public static async Task GenerateWhenDbContextExistsAndDoesNotHaveIdProperty()
633633
{
634634
var code =
635-
@"using Fritz.InstantAPIs.Generators.Helpers;
635+
@"using InstantAPIs.Generators.Helpers;
636636
using Microsoft.EntityFrameworkCore;
637637
using MyApplication;
638638
@@ -651,7 +651,7 @@ public class Contact
651651
}
652652
}";
653653
var generatedCode =
654-
@"using Fritz.InstantAPIs.Generators.Helpers;
654+
@"using InstantAPIs.Generators.Helpers;
655655
using Microsoft.AspNetCore.Builder;
656656
using Microsoft.AspNetCore.Http;
657657
using Microsoft.AspNetCore.Mvc;
@@ -730,7 +730,7 @@ await TestAssistants.RunAsync(code,
730730
public static async Task GenerateWhenMultipleAttributeDefinitionsExist()
731731
{
732732
var code =
733-
@"using Fritz.InstantAPIs.Generators.Helpers;
733+
@"using InstantAPIs.Generators.Helpers;
734734
using Microsoft.EntityFrameworkCore;
735735
using MyApplication;
736736
@@ -750,7 +750,7 @@ public class Contact
750750
}
751751
}";
752752
var generatedCode =
753-
@"using Fritz.InstantAPIs.Generators.Helpers;
753+
@"using InstantAPIs.Generators.Helpers;
754754
using Microsoft.AspNetCore.Builder;
755755
using Microsoft.AspNetCore.Http;
756756
using Microsoft.AspNetCore.Mvc;

‎Fritz.InstantAPIs.Generators.Tests/Diagnostics/DuplicateDefinitionDiagnosticTests.cs renamed to ‎InstantAPIs.Generators.Tests/Diagnostics/DuplicateDefinitionDiagnosticTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Fritz.InstantAPIs.Generators.Diagnostics;
1+
using InstantAPIs.Generators.Diagnostics;
22
using Microsoft.CodeAnalysis;
33
using Microsoft.CodeAnalysis.CSharp;
44
using Xunit;
55

6-
namespace Fritz.InstantAPIs.Generators.Tests.Diagnostics;
6+
namespace InstantAPIs.Generators.Tests.Diagnostics;
77

88
public static class DuplicateDefinitionDiagnosticTests
99
{

‎Fritz.InstantAPIs.Generators.Tests/Diagnostics/NotADbContextDiagnosticTests.cs renamed to ‎InstantAPIs.Generators.Tests/Diagnostics/NotADbContextDiagnosticTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using Fritz.InstantAPIs.Generators.Diagnostics;
1+
using InstantAPIs.Generators.Diagnostics;
22
using Microsoft.CodeAnalysis.CSharp.Syntax;
33
using Microsoft.CodeAnalysis.CSharp;
44
using Microsoft.CodeAnalysis;
55
using System;
66
using Xunit;
77
using System.Linq;
88

9-
namespace Fritz.InstantAPIs.Generators.Tests.Diagnostics;
9+
namespace InstantAPIs.Generators.Tests.Diagnostics;
1010

1111
public static class NotADbContextDiagnosticTests
1212
{

‎Fritz.InstantAPIs.Generators.Tests/Fritz.InstantAPIs.Generators.Tests.csproj renamed to ‎InstantAPIs.Generators.Tests/InstantAPIs.Generators.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<ProjectReference Include="..\Fritz.InstantAPIs.Generators.Helpers\Fritz.InstantAPIs.Generators.Helpers.csproj" />
25-
<ProjectReference Include="..\Fritz.InstantAPIs.Generators\Fritz.InstantAPIs.Generators.csproj" />
24+
<ProjectReference Include="..\InstantAPIs.Generators.Helpers\InstantAPIs.Generators.Helpers.csproj" />
25+
<ProjectReference Include="..\InstantAPIs.Generators\InstantAPIs.Generators.csproj" />
2626
</ItemGroup>
2727
</Project>

‎Fritz.InstantAPIs.Generators.Tests/TestAssistants.cs renamed to ‎InstantAPIs.Generators.Tests/TestAssistants.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Fritz.InstantAPIs.Generators.Helpers;
1+
using InstantAPIs.Generators.Helpers;
22
using Microsoft.AspNetCore.Builder;
33
using Microsoft.AspNetCore.Http;
44
using Microsoft.AspNetCore.Mvc;
@@ -15,7 +15,7 @@
1515
using System.Reflection;
1616
using System.Threading.Tasks;
1717

18-
namespace Fritz.InstantAPIs.Generators.Tests;
18+
namespace InstantAPIs.Generators.Tests;
1919

2020
using GeneratorTest = CSharpIncrementalSourceGeneratorVerifier<DbContextAPIGenerator>;
2121

‎Fritz.InstantAPIs.Generators/Builders/DbContextAPIBuilder.cs renamed to ‎InstantAPIs.Generators/Builders/DbContextAPIBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Linq;
88
using System.Text;
99

10-
namespace Fritz.InstantAPIs.Generators.Builders
10+
namespace InstantAPIs.Generators.Builders
1111
{
1212
public static class DbContextAPIBuilder
1313
{
@@ -43,7 +43,7 @@ public static class DbContextAPIBuilder
4343
var namespaces = new NamespaceGatherer();
4444
namespaces.Add("System");
4545
namespaces.Add("System.Collections.Generic");
46-
namespaces.Add("Fritz.InstantAPIs.Generators.Helpers");
46+
namespaces.Add("InstantAPIs.Generators.Helpers");
4747
namespaces.Add("Microsoft.EntityFrameworkCore");
4848
namespaces.Add("Microsoft.Extensions.Logging");
4949
namespaces.Add("Microsoft.Extensions.Logging.Abstractions");

‎Fritz.InstantAPIs.Generators/Builders/IEndpointRouteBuilderExtensionsBuilder.cs renamed to ‎InstantAPIs.Generators/Builders/IEndpointRouteBuilderExtensionsBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.CodeDom.Compiler;
33
using System.Collections.Generic;
44

5-
namespace Fritz.InstantAPIs.Generators.Builders
5+
namespace InstantAPIs.Generators.Builders
66
{
77
internal static class IEndpointRouteBuilderExtensionsBuilder
88
{

‎Fritz.InstantAPIs.Generators/Builders/TablesEnumBuilder.cs renamed to ‎InstantAPIs.Generators/Builders/TablesEnumBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44

5-
namespace Fritz.InstantAPIs.Generators.Builders
5+
namespace InstantAPIs.Generators.Builders
66
{
77
internal sealed class TablesEnumBuilder
88
{

‎Fritz.InstantAPIs.Generators/DbContextAPIGenerator.cs renamed to ‎InstantAPIs.Generators/DbContextAPIGenerator.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
using Fritz.InstantAPIs.Generators.Builders;
2-
using Fritz.InstantAPIs.Generators.Diagnostics;
1+
using InstantAPIs.Generators.Builders;
2+
using InstantAPIs.Generators.Diagnostics;
33
using Microsoft.CodeAnalysis;
44
using Microsoft.CodeAnalysis.CSharp.Syntax;
55
using System.Collections.Generic;
66
using System.Collections.Immutable;
77
using System.Linq;
88
using System.Threading;
99

10-
namespace Fritz.InstantAPIs.Generators;
10+
namespace InstantAPIs.Generators;
1111

1212
[Generator]
1313
public sealed class DbContextAPIGenerator
@@ -33,7 +33,7 @@ node is AttributeSyntax attributeNode &&
3333
{
3434
// Let's do a best guess that it's the attribute we're looking for.
3535
if(symbol.ContainingType.Name == "InstantAPIsForDbContextAttribute" &&
36-
symbol.ContainingNamespace.ToDisplayString() == "Fritz.InstantAPIs.Generators.Helpers")
36+
symbol.ContainingNamespace.ToDisplayString() == "InstantAPIs.Generators.Helpers")
3737
{
3838
// Find the attribute data for the node.
3939
var attributeData = model.Compilation.Assembly.GetAttributes().SingleOrDefault(

0 commit comments

Comments
 (0)