Skip to content

Commit ea00328

Browse files
committed
Fix code generation so it works everywhere
1 parent 1f4f58b commit ea00328

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard1.3</TargetFramework>
3+
<TargetFramework>netstandard1.5</TargetFramework>
44
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
55
<IsPackable>false</IsPackable>
6+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
67
</PropertyGroup>
78

89
<ItemGroup>
910
<PackageReference Include="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
10-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
1111
</ItemGroup>
12+
13+
<!--<Target Name="GetNativeManifest" />
14+
<Target Name="GetCopyToOutputDirectoryItems" />-->
1215
</Project>

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
44
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
55

6-
<CodeGenerationRoslynVersion>0.3.4</CodeGenerationRoslynVersion>
6+
<CodeGenerationRoslynVersion>0.3.11-g806e2e697e</CodeGenerationRoslynVersion>
77
<CodeGeneratorConfiguration Condition=" '$(CodeGeneratorConfiguration)' == '' ">Debug</CodeGeneratorConfiguration>
88
</PropertyGroup>
99

LibGit2Sharp/CodeGenerator.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project InitialTargets="GenerateCodeFirst">
33
<PropertyGroup>
4-
<CodeGenerationOutputPath>$(MSBuildProjectDirectory)\..\bin\CodeGeneration\$(CodeGeneratorConfiguration)\netstandard1.3\</CodeGenerationOutputPath>
4+
<CodeGenerationOutputPath>$(MSBuildProjectDirectory)\..\bin\CodeGeneration\$(CodeGeneratorConfiguration)\netstandard1.5\</CodeGenerationOutputPath>
55
</PropertyGroup>
66

77
<ItemGroup>

LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232
</ItemGroup>
3333
<ItemGroup>
3434
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.165]" />
35-
<PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" PrivateAssets="all" />
3635
<PackageReference Include="System.Security.SecureString" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
3736
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.0.1" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
3837
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
3938
<PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="all" />
4039
<DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" />
40+
41+
<PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" PrivateAssets="all" />
42+
<DotNetCliToolReference Include="dotnet-codegen" Version="$(CodeGenerationRoslynVersion)" />
4143
</ItemGroup>
4244
<Import Project="CodeGenerator.targets" />
4345
<Import Project="ExtraDefine.targets" />

nuget.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
88
<add key="CodeGeneration.Roslyn" value="https://ci.appveyor.com/nuget/codegeneration-roslyn" />
99
<add key="nerdbank-gitversioning" value="https://ci.appveyor.com/nuget/nerdbank-gitversioning" />
10+
<add key="corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
1011
</packageSources>
11-
</configuration>
12+
</configuration>

0 commit comments

Comments
 (0)