Skip to content

Commit 1147561

Browse files
olmobrutallolmobrutall
committed
update MsBuildTask and TSGenerator
1 parent ac4c4c3 commit 1147561

16 files changed

+260
-241
lines changed

‎Signum.Framework.sln

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ VisualStudioVersion = 17.0.31612.314
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.Utilities", "Signum.Utilities\Signum.Utilities.csproj", "{F7D3F72D-741D-4F67-8CF8-CD41B9035FED}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.Entities", "Signum.Entities\Signum.Entities.csproj", "{F2B51D08-498D-4C9F-8112-9521A7762B02}"
9-
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.Engine", "Signum.Engine\Signum.Engine.csproj", "{7F2DB6FE-C109-4057-B207-C62A767F905D}"
11-
EndProject
128
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.Test", "Signum.Test\Signum.Test.csproj", "{DE565EB3-EE44-469D-B6B9-C8F3CA0712EF}"
139
EndProject
1410
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.TSGenerator", "Signum.TSGenerator\Signum.TSGenerator.csproj", "{32990F1A-6A78-439E-8194-68F05AA1CCB1}"
1511
EndProject
1612
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.MSBuildTask", "Signum.MSBuildTask\Signum.MSBuildTask.csproj", "{5D992EC2-1F54-4B7B-AF47-CB76E340B658}"
1713
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum", "Signum\Signum.csproj", "{C8AD7249-3CC8-490F-8951-532C0F9C0613}"
15+
EndProject
1816
Global
1917
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2018
Debug|Any CPU = Debug|Any CPU
@@ -24,12 +22,6 @@ Global
2422
{F7D3F72D-741D-4F67-8CF8-CD41B9035FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2523
{F7D3F72D-741D-4F67-8CF8-CD41B9035FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
2624
{F7D3F72D-741D-4F67-8CF8-CD41B9035FED}.Release|Any CPU.ActiveCfg = Release|x64
27-
{F2B51D08-498D-4C9F-8112-9521A7762B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{F2B51D08-498D-4C9F-8112-9521A7762B02}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{F2B51D08-498D-4C9F-8112-9521A7762B02}.Release|Any CPU.ActiveCfg = Release|x64
30-
{7F2DB6FE-C109-4057-B207-C62A767F905D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{7F2DB6FE-C109-4057-B207-C62A767F905D}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{7F2DB6FE-C109-4057-B207-C62A767F905D}.Release|Any CPU.ActiveCfg = Release|x64
3325
{DE565EB3-EE44-469D-B6B9-C8F3CA0712EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3426
{DE565EB3-EE44-469D-B6B9-C8F3CA0712EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
3527
{DE565EB3-EE44-469D-B6B9-C8F3CA0712EF}.Release|Any CPU.ActiveCfg = Release|x64
@@ -39,6 +31,10 @@ Global
3931
{5D992EC2-1F54-4B7B-AF47-CB76E340B658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4032
{5D992EC2-1F54-4B7B-AF47-CB76E340B658}.Debug|Any CPU.Build.0 = Debug|Any CPU
4133
{5D992EC2-1F54-4B7B-AF47-CB76E340B658}.Release|Any CPU.ActiveCfg = Release|x64
34+
{C8AD7249-3CC8-490F-8951-532C0F9C0613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{C8AD7249-3CC8-490F-8951-532C0F9C0613}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{C8AD7249-3CC8-490F-8951-532C0F9C0613}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{C8AD7249-3CC8-490F-8951-532C0F9C0613}.Release|Any CPU.Build.0 = Release|Any CPU
4238
EndGlobalSection
4339
GlobalSection(SolutionProperties) = preSolution
4440
HideSolutionNode = FALSE

‎Signum.MSBuildTask/AutoPropertyConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Mono.Cecil;
1+
using Mono.Cecil;
22
using System.Linq;
33
using Mono.Cecil.Cil;
44

@@ -19,7 +19,7 @@ public AutoPropertyConverter(AssemblyDefinition assembly, PreloadingAssemblyReso
1919
this.Assembly = assembly;
2020
this.Resolver = resolver;
2121

22-
this.SigumEntities = assembly.Name.Name == "Signum.Entities" ? assembly : resolver.SignumEntities;
22+
this.SigumEntities = assembly.Name.Name == "Signum" ? assembly : resolver.Signum;
2323
this.ModifiableEntity = SigumEntities.MainModule.GetType("Signum.Entities", "ModifiableEntity");
2424
this.SetMethod = Assembly.MainModule.ImportReference(this.ModifiableEntity.Methods.Single(m => m.Name == "Set" && m.IsDefinition));
2525
this.GetMethod = Assembly.MainModule.ImportReference(this.ModifiableEntity.Methods.Single(m => m.Name == "Get" && m.IsDefinition));
@@ -125,4 +125,4 @@ static string BackingFieldName(PropertyDefinition p)
125125
{
126126
return "<" + p.Name + ">k__BackingField";
127127
}
128-
}
128+
}

‎Signum.MSBuildTask/FieldAutoInitiaizer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public FieldAutoInitializer(AssemblyDefinition assembly, PreloadingAssemblyResol
3333
this.SystemType = tr.Resolve();
3434
this.GetTypeFromHandle = this.SystemType.GetMethods().Single(a => a.Name == "GetTypeFromHandle");
3535

36-
this.SigumEntities = assembly.Name.Name == "Signum.Entities" ? assembly : resolver.SignumEntities;
36+
this.SigumEntities = assembly.Name.Name == "Signum" ? assembly : resolver.Signum;
3737
this.AutoInit = SigumEntities.MainModule.GetType("Signum.Entities", "AutoInitAttribute");
38-
this.OperationSymbol = SigumEntities.MainModule.GetType("Signum.Entities", "OperationSymbol").Resolve();
38+
this.OperationSymbol = SigumEntities.MainModule.GetType("Signum.Operations", "OperationSymbol").Resolve();
3939
this.OperationSymbolConstruct = this.OperationSymbol.NestedTypes.Single(t => t.Name == "Construct`1").Resolve();
4040

4141
}
@@ -119,21 +119,21 @@ private MethodReference GetMethod(TypeReference fieldType)
119119
{
120120
switch (generic.ElementType.FullName)
121121
{
122-
case "Signum.Entities.ConstructSymbol`1/Simple":
122+
case "Signum.Operations.ConstructSymbol`1/Simple":
123123
return OperationSymbolConstruct.Methods.Single(a => a.Name == "Simple")
124124
.MakeHostInstanceGeneric(generic.GenericArguments.First());
125-
case "Signum.Entities.ConstructSymbol`1/From`1":
125+
case "Signum.Operations.ConstructSymbol`1/From`1":
126126
return OperationSymbolConstruct.Methods.Single(a => a.Name == "From")
127127
.MakeHostInstanceGeneric(generic.GenericArguments.First())
128128
.MakeGenericMethod(generic.GenericArguments.Last());
129-
case "Signum.Entities.ConstructSymbol`1/FromMany`1":
129+
case "Signum.Operations.ConstructSymbol`1/FromMany`1":
130130
return OperationSymbolConstruct.Methods.Single(a => a.Name == "FromMany")
131131
.MakeHostInstanceGeneric(generic.GenericArguments.First())
132132
.MakeGenericMethod(generic.GenericArguments.Last());
133-
case "Signum.Entities.ExecuteSymbol`1":
133+
case "Signum.Operations.ExecuteSymbol`1":
134134
return OperationSymbol.Methods.Single(a => a.Name == "Execute")
135135
.MakeGenericMethod(generic.GenericArguments.Single());
136-
case "Signum.Entities.DeleteSymbol`1":
136+
case "Signum.Operations.DeleteSymbol`1":
137137
return OperationSymbol.Methods.Single(a => a.Name == "Delete")
138138
.MakeGenericMethod(generic.GenericArguments.Single());
139139
}

‎Signum.MSBuildTask/PreloadingAssemblyResolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal class PreloadingAssemblyResolver : DefaultAssemblyResolver
1111
public AssemblyDefinition SystemRuntime { get; private set; }
1212
public AssemblyDefinition SystemLinqExpressions { get; private set; }
1313
public AssemblyDefinition SignumUtilities { get; private set; }
14-
public AssemblyDefinition SignumEntities { get; private set; }
14+
public AssemblyDefinition Signum { get; private set; }
1515

1616
Dictionary<string, string> assemblyLocations;
1717

@@ -29,8 +29,8 @@ public PreloadingAssemblyResolver(string[] references)
2929
if (assembly.Name.Name == "System.Linq.Expressions")
3030
SystemLinqExpressions = assembly;
3131

32-
if (assembly.Name.Name == "Signum.Entities")
33-
SignumEntities = assembly;
32+
if (assembly.Name.Name == "Signum")
33+
Signum = assembly;
3434

3535
if (assembly.Name.Name == "Signum.Utilities")
3636
SignumUtilities = assembly;

‎Signum.MSBuildTask/Properties/launchSettings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"profiles": {
3-
"Signum.Entities": {
3+
"Signum": {
44
"commandName": "Project",
5-
"commandLineArgs": "\"obj\\x64\\Debug\\net5\\Signum.Entities.dll\" \"D:\\Signum\\southwind\\Framework\\Signum.Entities\\obj\\SignumReferences.txt\"",
6-
"workingDirectory": "D:\\Signum\\southwind\\Framework\\Signum.Entities\\"
5+
"commandLineArgs": "\"obj\\Debug\\net7.0\\Signum.dll\" \"D:\\Signum\\southwind\\Framework\\Signum\\obj\\SignumReferences.txt\"",
6+
"workingDirectory": "D:\\Signum\\southwind\\Framework\\Signum\\"
77
}
88
}
9-
}
9+
}

‎Signum.MSBuildTask/Signum.MSBuildTask.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<LangVersion>latest</LangVersion>
1111
<Platforms>x64;AnyCPU</Platforms>
1212
<NuSpecFile>Signum.MSBuildTask.nuspec</NuSpecFile>
13-
<Version>7.0.0</Version>
13+
<Version>7.5.0-beta</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎Signum.MSBuildTask/Signum.MSBuildTask.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Signum.MSBuildTask</id>
5-
<version>7.0.0</version>
5+
<version>7.5.0-beta</version>
66
<title>IL rewriter for Signum Framework applications</title>
77
<authors>Olmo del Corral</authors>
88
<projectUrl>http://www.signumframework.com</projectUrl>

0 commit comments

Comments
 (0)