Skip to content

Commit f293612

Browse files
kccarter76kccarter76
committed
no message
1 parent e3158ad commit f293612

File tree

10 files changed

+55
-21
lines changed

10 files changed

+55
-21
lines changed

‎SubSonic.Core.Template/Settings.ttinclude‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
<#@ assembly name="SubSonic.Core.Abstractions" #>
1+
<#@ parameter type="System.String" name="$connectionKey$" #>
2+
<#@ assembly name="SubSonic.Core.Abstractions" #>
23
<#@ assembly name="SubSonic.Core.DAL" #>
34
<#@ assembly name="SubSonic.Core.Extensions" #>
4-
<#@ parameter type="System.String" name="$connectionKey$" #>
5+
<#@ assembly name="System.Linq.Expressions" #>
6+
<#@ assembly name="System.Linq.Queryable" #>
7+
<#@ assembly name="System.Linq" #>
8+
59
<#@ import namespace="System.Collections.Generic" #>
610
<#@ import namespace="System.Data" #>
711
<#@ import namespace="System.Data.Common" #>
@@ -12,13 +16,22 @@ public class Settings
1216
{
1317
public static ITextTemplatingEngineHost Host { get; set; }
1418

15-
public string[] ExcludeTables
19+
public static IEnumerable<string> ExcludeRelationships
20+
{
21+
get
22+
{
23+
return new string[] { };
24+
}
25+
}
26+
27+
public static IEnumerable<string> ExcludeTables
1628
{
1729
get
1830
{
1931
return new string[]{
2032
"sysdiagrams",
2133
"BuildVersion",
34+
"__RefactorLog",
2235
"aspnet_Applications",
2336
"aspnet_Membership",
2437
"aspnet_Paths",

‎SubSonic.Core.Template/SqlServer.ttinclude‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<#@ assembly name="Microsoft.Extensions.Options" #>
77
<#@ assembly name="Microsoft.Extensions.Primitives" #>
88
<#@ assembly name="SubSonic.Extensions.SqlServer" #>
9-
<#@ assembly name="System.Linq.Expressions" #>
10-
<#@ assembly name="System.Linq.Queryable" #>
119

1210
<#@ import namespace="Microsoft.Extensions.Logging" #>
1311
<#@ import namespace="SubSonic.Extensions.SqlServer" #>

‎SubSonic.Core.Template/SubSonicDataContext.stt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ namespace TemplateIntegrationTest.DAL
2020
this.services = services ?? throw new ArgumentNullException(nameof(services));
2121
}
2222

23-
<#foreach(Models.Table table in Context.Tables) {#>
23+
<#foreach(Models.Table table in Context.Tables) {
24+
if (Settings.ExcludeTables.Any(x => x.Equals(table.Name, StringComparison.OrdinalIgnoreCase)))
25+
{
26+
continue;
27+
}
28+
#>
2429
public ISubSonicSetCollection<Models.<#=table.Name#>> <#=table.Name.Pluralize()#> { get; protected set; }
2530
<#}#>
2631
}

‎SubSonic.Core.Template/SubSonicDataModels.stt‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<#@ template hostspecific="true" language="C#" #>
22
<#@ include file="SqlServer.ttinclude" #>
3+
<#@ import namespace="System.Linq" #>
34
<#
45
Settings.Host = Host;
56
Context = new SqlGeneratorContext(Settings.Connection);
@@ -9,7 +10,12 @@ using System.ComponentModel.DataAnnotations.Schema;
910

1011
namespace TemplateIntegrationTest.DAL.Models
1112
{
12-
<#foreach(Models.Table table in Context.Tables) {#>
13+
<#foreach(Models.Table table in Context.Tables) {
14+
if (Settings.ExcludeTables.Any(x => x.Equals(table.Name, StringComparison.OrdinalIgnoreCase)))
15+
{
16+
continue;
17+
}
18+
#>
1319
[Table("<#=table.Name#>", Schema = "<#=table.Schema#>")]
1420
public partial class <#=table.Name#>
1521
{
@@ -26,10 +32,24 @@ namespace TemplateIntegrationTest.DAL.Models
2632
<#}#>
2733
public <#=((col.IsIdentity || col.IsComputed) ? "" : "virtual ")#><#=col.ToSimpleType()#> <#=col.ColumnName#> { get; set; }
2834
<#}#>
29-
<#foreach (Models.Relationship relation in table.Relationships) {#>
35+
<#foreach (Models.Relationship relation in table.WithOneRelationships) {
36+
if (Settings.ExcludeRelationships.Any(x => x.Equals(table.Name, StringComparison.OrdinalIgnoreCase)))
37+
{
38+
continue;
39+
}
40+
#>
3041
[ForeignKey(nameof(<#=relation.ColumnName#>))]
3142
public virtual <#=relation.ForiegnTableName#> <#=relation.ForiegnTableName#> { get; set; }
3243

44+
<#}#>
45+
<#foreach (Models.Relationship relation in table.WithManyRelationships) {
46+
if (Settings.ExcludeRelationships.Any(x => x.Equals(table.Name, StringComparison.OrdinalIgnoreCase)))
47+
{
48+
continue;
49+
}
50+
#>
51+
public virtual ISubSonicCollection<<#=relation.TableName#>> <#=relation.TableName.Pluralize()#> { get; set; }
52+
3353
<#}#>
3454
}
3555

‎SubSonic.Core.TemplateWizard/SubSonic.Core.VisualStudio.Wizards.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
4646
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
48+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.3.1.7\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
51+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.7\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.VisualStudio.Data.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5555
<HintPath>..\packages\Microsoft.VisualStudio.Data.Services.9.0.21023\lib\net20\Microsoft.VisualStudio.Data.Core.dll</HintPath>

‎SubSonic.Core.TemplateWizard/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-3.1.6.0" newVersion="3.1.6.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-3.1.7.0" newVersion="3.1.7.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

‎SubSonic.Core.TemplateWizard/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net472" />
4-
<package id="Microsoft.Extensions.DependencyInjection" version="3.1.6" targetFramework="net472" />
5-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.6" targetFramework="net472" />
4+
<package id="Microsoft.Extensions.DependencyInjection" version="3.1.7" targetFramework="net472" />
5+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.7" targetFramework="net472" />
66
<package id="Microsoft.VisualStudio.Data.Services" version="9.0.21023" targetFramework="net472" />
77
<package id="Microsoft.VisualStudio.OLE.Interop" version="16.7.30328.74" targetFramework="net472" />
88
<package id="Microsoft.VisualStudio.Shell.Interop" version="16.7.30328.74" targetFramework="net472" />

‎SubSonic.Core.VisualStudio.Common/SubSonic.Core.VisualStudio.Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
1111
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.153.0" />
12-
<PackageReference Include="Mono.TextTemplating" Version="2.2.0-preview-0170-g6d4afad9f9" />
12+
<PackageReference Include="Mono.TextTemplating" Version="2.2.0-preview-0171-g166965ae2b" />
1313
<PackageReference Include="NuGet.Configuration" Version="5.7.0" />
1414
<PackageReference Include="SubSonic.Core.Extensions" Version="1.1.0" />
1515
<PackageReference Include="SubSonic.Core.Remoting" Version="1.0.0-preview-0051-g6c481c84e7" />

‎SubSonic.Core.VisualStudio.Common/SubSonic.Core.VisualStudio.Host/RemoteTransformationHost.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ public class RemoteTransformationHost
2222
{
2323
private static readonly Dictionary<string, string> KnownAssemblyNames = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2424
{
25-
{ "System", Path.GetFileName(typeof(System.Uri).Assembly.Location) },
26-
{ "System.Core", Path.GetFileName(typeof(System.Linq.Enumerable).Assembly.Location) },
25+
{ "System", Path.GetFileName(typeof(String).Assembly.Location) },
2726
{ "System.Data", Path.GetFileName(typeof(System.Data.DataTable).Assembly.Location) },
28-
{ "System.Linq", Path.GetFileName(typeof(System.Linq.Enumerable).Assembly.Location) },
2927
{ "System.Xml", Path.GetFileName(typeof(System.Xml.XmlAttribute).Assembly.Location) }
3028
};
3129

‎SubSonic.Core.VisualStudio.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
</ItemGroup>
252252
<ItemGroup>
253253
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
254-
<Version>3.1.6</Version>
254+
<Version>3.1.7</Version>
255255
</PackageReference>
256256
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
257257
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)