Update code generation to use .NET SDK projects

libaowei · Mar 12, 2017 · d851767 · d851767
1 parent 4ca2bbb
commit d851767
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 365 deletions.
diff --git a/CodeGeneration.Debugging/App.config b/CodeGeneration.Debugging/App.config
diff --git a/CodeGeneration.Debugging/CodeGeneration.Debugging.csproj b/CodeGeneration.Debugging/CodeGeneration.Debugging.csproj
@@ -1,60 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9212ECC-76F0-4658-9C89-DD506EE788B5}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CodeGeneration.Debugging</RootNamespace>
-    <AssemblyName>CodeGeneration.Debugging</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFramework>net46</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/CodeGeneration.Debugging/Properties/AssemblyInfo.cs b/CodeGeneration.Debugging/Properties/AssemblyInfo.cs
diff --git a/CodeGeneration/CodeGeneration.csproj b/CodeGeneration/CodeGeneration.csproj
@@ -1,65 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6598997B-9419-4CC1-84FF-9621B555E9C0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CodeGeneration</RootNamespace>
-    <AssemblyName>CodeGeneration</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>libgit2sharp.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="OfferFriendlyInteropOverloadsGenerator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="libgit2sharp.snk" />
-    <None Include="project.json" />
+    <PackageReference Include="CodeGeneration.Roslyn" Version="0.2.10" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.19-beta" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs b/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs
@@ -165,7 +165,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                         SyntaxFactory.MemberAccessExpression(
                             SyntaxKind.SimpleMemberAccessExpression,
                             SyntaxFactory.IdentifierName(marshalerLocalName),
-                            SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalManagedToNative))))
+                            SyntaxFactory.IdentifierName("MarshalManagedToNative")))
                         .AddArgumentListArguments(SyntaxFactory.Argument(SyntaxFactory.IdentifierName(parameter.OriginalParameter.Identifier)));
                 var localVarIdentifier = SyntaxFactory.IdentifierName(Invariant($"_{parameter.OriginalParameter.Identifier.ValueText}"));
                 inputMarshaling.Add(
@@ -192,7 +192,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                                     SyntaxFactory.MemberAccessExpression(
                                         SyntaxKind.SimpleMemberAccessExpression,
                                         SyntaxFactory.IdentifierName(marshalerLocalName),
-                                        SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalNativeToManaged))),
+                                        SyntaxFactory.IdentifierName("MarshalNativeToManaged")),
                                     SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(
                                         SyntaxFactory.ObjectCreationExpression(
                                             IntPtrTypeSyntax,
@@ -209,7 +209,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                         SyntaxFactory.MemberAccessExpression(
                             SyntaxKind.SimpleMemberAccessExpression,
                             SyntaxFactory.IdentifierName(marshalerLocalName),
-                            SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.CleanUpNativeData))))
+                            SyntaxFactory.IdentifierName("CleanUpNativeData")))
                     .AddArgumentListArguments(SyntaxFactory.Argument(cleanUpExpression))));
             }
 
@@ -245,7 +245,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                             SyntaxFactory.MemberAccessExpression(
                                 SyntaxKind.SimpleMemberAccessExpression,
                                 SyntaxFactory.IdentifierName(marshalerLocalName),
-                                SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.MarshalNativeToManaged))),
+                                SyntaxFactory.IdentifierName("MarshalNativeToManaged")),
                             SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(resultLocal)))));
 
                     invocationStatement = SyntaxFactory.ExpressionStatement(intPtrResultExpression);
@@ -256,7 +256,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                             SyntaxFactory.MemberAccessExpression(
                                 SyntaxKind.SimpleMemberAccessExpression,
                                 SyntaxFactory.IdentifierName(marshalerLocalName),
-                                SyntaxFactory.IdentifierName(nameof(ICustomMarshaler.CleanUpNativeData))))
+                                SyntaxFactory.IdentifierName("CleanUpNativeData")))
                         .AddArgumentListArguments(SyntaxFactory.Argument(resultLocal))));
                 }
                 else

diff --git a/CodeGeneration/Properties/AssemblyInfo.cs b/CodeGeneration/Properties/AssemblyInfo.cs
diff --git a/CodeGeneration/project.json b/CodeGeneration/project.json
diff --git a/CodeGenerationAttributes.Net40/CodeGenerationAttributes.Net40.csproj b/CodeGenerationAttributes.Net40/CodeGenerationAttributes.Net40.csproj
diff --git a/CodeGenerationAttributes.Net40/Properties/AssemblyInfo.cs b/CodeGenerationAttributes.Net40/Properties/AssemblyInfo.cs
diff --git a/CodeGenerationAttributes.Net40/libgit2sharp.snk b/CodeGenerationAttributes.Net40/libgit2sharp.snk
diff --git a/CodeGenerationAttributes.Net40/project.json b/CodeGenerationAttributes.Net40/project.json
diff --git a/CodeGenerationAttributes.Portable/CodeGenerationAttributes.Portable.csproj b/CodeGenerationAttributes.Portable/CodeGenerationAttributes.Portable.csproj
diff --git a/CodeGenerationAttributes.Portable/Properties/AssemblyInfo.cs b/CodeGenerationAttributes.Portable/Properties/AssemblyInfo.cs
diff --git a/CodeGenerationAttributes.Portable/libgit2sharp.snk b/CodeGenerationAttributes.Portable/libgit2sharp.snk