Skip to content

Commit d851767

Browse files
AArnottAArnott
committed
Update code generation to use .NET SDK projects
1 parent 4ca2bbb commit d851767

22 files changed

+33
-365
lines changed

‎CodeGeneration.Debugging/App.config

-6
This file was deleted.

‎CodeGeneration.Debugging/CodeGeneration.Debugging.csproj

+3-57
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{C9212ECC-76F0-4658-9C89-DD506EE788B5}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CodeGeneration.Debugging</RootNamespace>
11-
<AssemblyName>CodeGeneration.Debugging</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3+
<TargetFramework>net46</TargetFramework>
4+
<IsPackable>false</IsPackable>
155
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="Program.cs" />
47-
<Compile Include="Properties\AssemblyInfo.cs" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<None Include="App.config" />
51-
</ItemGroup>
52-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
53-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
54-
Other similar extension points exist, see Microsoft.Common.targets.
55-
<Target Name="BeforeBuild">
56-
</Target>
57-
<Target Name="AfterBuild">
58-
</Target>
59-
-->
606
</Project>

‎CodeGeneration.Debugging/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎CodeGeneration/CodeGeneration.csproj

+7-60
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{6598997B-9419-4CC1-84FF-9621B555E9C0}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CodeGeneration</RootNamespace>
11-
<AssemblyName>CodeGeneration</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
3+
<TargetFramework>netstandard1.3</TargetFramework>
4+
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
5+
<IsPackable>false</IsPackable>
156
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<PropertyGroup>
34-
<SignAssembly>true</SignAssembly>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<AssemblyOriginatorKeyFile>libgit2sharp.snk</AssemblyOriginatorKeyFile>
38-
</PropertyGroup>
39-
<ItemGroup>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="OfferFriendlyInteropOverloadsGenerator.cs" />
51-
<Compile Include="Properties\AssemblyInfo.cs" />
52-
</ItemGroup>
7+
538
<ItemGroup>
54-
<None Include="libgit2sharp.snk" />
55-
<None Include="project.json" />
9+
<PackageReference Include="CodeGeneration.Roslyn" Version="0.2.10" />
10+
<PackageReference Include="Nerdbank.GitVersioning" Version="1.6.19-beta" />
5611
</ItemGroup>
57-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
59-
Other similar extension points exist, see Microsoft.Common.targets.
60-
<Target Name="BeforeBuild">
61-
</Target>
62-
<Target Name="AfterBuild">
63-
</Target>
64-
-->
6512
</Project>

‎CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
165165
SyntaxFactory.MemberAccessExpression(
166166
SyntaxKind.SimpleMemberAccessExpression,
167167
SyntaxFactory.IdentifierName(marshalerLocalName),
168-
SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalManagedToNative))))
168+
SyntaxFactory.IdentifierName("MarshalManagedToNative")))
169169
.AddArgumentListArguments(SyntaxFactory.Argument(SyntaxFactory.IdentifierName(parameter.OriginalParameter.Identifier)));
170170
var localVarIdentifier = SyntaxFactory.IdentifierName(Invariant($"_{parameter.OriginalParameter.Identifier.ValueText}"));
171171
inputMarshaling.Add(
@@ -192,7 +192,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
192192
SyntaxFactory.MemberAccessExpression(
193193
SyntaxKind.SimpleMemberAccessExpression,
194194
SyntaxFactory.IdentifierName(marshalerLocalName),
195-
SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalNativeToManaged))),
195+
SyntaxFactory.IdentifierName("MarshalNativeToManaged")),
196196
SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(
197197
SyntaxFactory.ObjectCreationExpression(
198198
IntPtrTypeSyntax,
@@ -209,7 +209,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
209209
SyntaxFactory.MemberAccessExpression(
210210
SyntaxKind.SimpleMemberAccessExpression,
211211
SyntaxFactory.IdentifierName(marshalerLocalName),
212-
SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.CleanUpNativeData))))
212+
SyntaxFactory.IdentifierName("CleanUpNativeData")))
213213
.AddArgumentListArguments(SyntaxFactory.Argument(cleanUpExpression))));
214214
}
215215

@@ -245,7 +245,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
245245
SyntaxFactory.MemberAccessExpression(
246246
SyntaxKind.SimpleMemberAccessExpression,
247247
SyntaxFactory.IdentifierName(marshalerLocalName),
248-
SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalNativeToManaged))),
248+
SyntaxFactory.IdentifierName("MarshalNativeToManaged")),
249249
SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(resultLocal)))));
250250

251251
invocationStatement = SyntaxFactory.ExpressionStatement(intPtrResultExpression);
@@ -256,7 +256,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
256256
SyntaxFactory.MemberAccessExpression(
257257
SyntaxKind.SimpleMemberAccessExpression,
258258
SyntaxFactory.IdentifierName(marshalerLocalName),
259-
SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.CleanUpNativeData))))
259+
SyntaxFactory.IdentifierName("CleanUpNativeData")))
260260
.AddArgumentListArguments(SyntaxFactory.Argument(resultLocal))));
261261
}
262262
else

‎CodeGeneration/Properties/AssemblyInfo.cs

-5
This file was deleted.

‎CodeGeneration/project.json

-12
This file was deleted.

‎CodeGenerationAttributes.Net40/CodeGenerationAttributes.Net40.csproj

-60
This file was deleted.

‎CodeGenerationAttributes.Net40/Properties/AssemblyInfo.cs

-5
This file was deleted.

‎CodeGenerationAttributes.Net40/libgit2sharp.snk

-596 Bytes
Binary file not shown.

‎CodeGenerationAttributes.Net40/project.json

-12
This file was deleted.

‎CodeGenerationAttributes.Portable/CodeGenerationAttributes.Portable.csproj

-59
This file was deleted.

‎CodeGenerationAttributes.Portable/Properties/AssemblyInfo.cs

-7
This file was deleted.

‎CodeGenerationAttributes.Portable/libgit2sharp.snk

-596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)