Skip to content

Commit 829bdb0

Browse files
committed
Fix build
1 parent 2d8a5c6 commit 829bdb0

File tree

7 files changed

+30
-12
lines changed

7 files changed

+30
-12
lines changed

Blocks/src/CodeJam.Blocks.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@
7575
<Compile Include="..\..\Build\Jetbrains.Annotations.cs">
7676
<Link>Jetbrains.Annotations.cs</Link>
7777
</Compile>
78-
<Content Include="Readme.txt">
79-
<Pack>true</Pack>
80-
<PackagePath>Readme.txt</PackagePath>
81-
</Content>
8278
<Compile Include="Mapping\CodeJamConvertException.cs" />
8379
<Compile Include="Mapping\CodeJamMappingException.cs" />
8480
<Compile Include="Mapping\ConvertBuilder.cs" />
@@ -111,6 +107,10 @@
111107
<Compile Include="Metadata\NamespaceDoc.cs" />
112108
<Compile Include="Metadata\XmlAttributeReader.cs" />
113109
<Compile Include="Properties\AssemblyInfo.cs" />
110+
<Content Include="Readme.txt">
111+
<Pack>true</Pack>
112+
<PackagePath>Readme.txt</PackagePath>
113+
</Content>
114114
<Compile Include="Services\IServicePublisher.cs" />
115115
<Compile Include="Services\NamespaceDoc.cs" />
116116
<Compile Include="Services\ServiceContainer.cs" />

DocsProject/DocsProject.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
35+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
36+
<DebugType>pdbonly</DebugType>
37+
<Optimize>true</Optimize>
38+
<OutputPath>bin\Publish\</OutputPath>
39+
<DefineConstants>TRACE;DOCFX</DefineConstants>
40+
<ErrorReport>prompt</ErrorReport>
41+
<WarningLevel>4</WarningLevel>
42+
</PropertyGroup>
3543
<ItemGroup>
3644
<Reference Include="System" />
3745
<Reference Include="System.Core" />

Experimental/src/CodeJam.Experimental.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@
8080
<Compile Include="Collections\DisjointSetsT.cs" />
8181
<Compile Include="Parsing\BinaryOperator.cs" />
8282
<Compile Include="Parsing\CharReader.cs" />
83-
<Compile Include="Parsing\Operator.cs" />
84-
<Compile Include="Parsing\Parser.cs" />
8583
<Compile Include="Parsing\ExpressionDefinition.cs" />
84+
<Compile Include="Parsing\Operator.cs" />
8685
<Compile Include="Parsing\ParseHelper.cs" />
86+
<Compile Include="Parsing\Parser.cs" />
8787
<Compile Include="Parsing\PostfixUnaryOperator.cs" />
8888
<Compile Include="Parsing\PrefixUnaryOperator.cs" />
8989
<Compile Include="Properties\AssemblyInfo.cs" />

Experimental/tests/CodeJam.Experimental-Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<Compile Include="CmdLine\ParserTest.cs" />
5858
<Compile Include="CmdLine\PrintUsageTest.cs" />
5959
<Compile Include="Collections\DisjointSetsTest.cs" />
60-
<Compile Include="UseCases\EnumCodeUseCases.cs" />
6160
<Compile Include="Parsing\ParseHelperTests.cs" />
6261
<Compile Include="Properties\AssemblyInfo.cs" />
62+
<Compile Include="UseCases\EnumCodeUseCases.cs" />
6363
<Compile Include="UseCases\TempDataUseCases.cs" />
6464
</ItemGroup>
6565
<ItemGroup>

Main/src/CodeJam.Main.csproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<Compile Include="Collections\Enumerable\EnumerableExtensions.Slice.cs" />
217217
<Compile Include="Collections\Enumerable\EnumerableExtensions.Split.cs" />
218218
<Compile Include="Collections\Enumerable\EnumerableExtensions.TakeLast.cs" />
219-
<Compile Include="Collections\Enumerable\EnumerableExtensions.ToLookupDictionary.cs" />
219+
<Compile Include="Collections\Enumerable\EnumerableExtensions.ToDictionary.cs" />
220220
<Compile Include="Collections\Enumerable\EnumerableExtensions.TopoSort.cs" />
221221
<Compile Include="Collections\Enumerable\EnumerableExtensions.With.cs" />
222222
<Compile Include="Collections\Enumerable\IndexedItem.cs" />
@@ -486,6 +486,16 @@
486486
<Compile Include="Threading\ParallelQueue.cs" />
487487
<Compile Include="Threading\ReaderWriterLockSlimExtensions.cs" />
488488
<Compile Include="Threading\TaskHelper.cs" />
489+
<Compile Include="Threading\TaskHelper.generated.cs">
490+
<DesignTime>True</DesignTime>
491+
<AutoGen>True</AutoGen>
492+
<DependentUpon>TaskHelper.tt</DependentUpon>
493+
</Compile>
494+
<Compile Include="Threading\TaskHelper.Marker.cs" />
495+
<None Include="Threading\TaskHelper.tt">
496+
<Generator>TextTemplatingFileGenerator</Generator>
497+
<LastGenOutput>TaskHelper.generated.cs</LastGenOutput>
498+
</None>
489499
<Compile Include="UriHelper.cs" />
490500
<Compile Include="Utilities\HGlobal.cs" />
491501
<Compile Include="Utilities\HGlobalScope.cs" />

Main/src/Threading/TaskHelper.generated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static bool WaitAll([NotNull] this Task[] tasks, int timeout) =>
111111
public static void WaitAll([NotNull] this Task[] tasks) => Task.WaitAll(tasks);
112112
#endregion
113113

114-
#if !FW40
114+
#if !SUPPORTS_NET40
115115
#region WhenAll
116116
/// <summary>
117117
/// Creates a task that will complete when all of the <see cref="Task"/> objects in an enumerable collection

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
configuration: Release
1+
configuration: Publish
22
image: Visual Studio 2017
33

44
environment:
@@ -24,7 +24,7 @@ assembly_info:
2424
#dotnet_csproj:
2525
# patch: true
2626
# file: 'Build\CodeJam.Default.props'
27-
# version: '{buildVersion}'
27+
# version: '$(buildVersion)'
2828
# package_version: '$(nugetVersion)'
2929

3030
nuget:
@@ -35,7 +35,7 @@ before_build:
3535
# Force install System.ValueTuple 4.3.1 for FWs 4.0-4.6 build, because 4.4.0 is incompatible with older BCLs
3636
- cmd: nuget install System.ValueTuple -Version 4.3.1 -OutputDirectory packages
3737
- cmd: nuget restore CodeJam.sln
38-
- ps: &".\Build\Appveyor.BeforeBuild.ps1" -buildVersion "$env:buildVersion" -nugetVersion "$env:nugetVersion"
38+
- ps: .\Build\Appveyor.BeforeBuild.ps1 -buildVersion $env:buildVersion -nugetVersion $env:nugetVersion
3939

4040
build:
4141
project: CodeJam.sln

0 commit comments

Comments
 (0)