Skip to content

Commit 3e44616

Browse files
jgauffinjgauffin
committed
I hope that I've managed to fix all build issues that seem to be related to having both the new and old csproj format in the solution.
1 parent 4729bc5 commit 3e44616

File tree

4 files changed

+52
-62
lines changed

4 files changed

+52
-62
lines changed

‎src/Server/Coderr.Server.Api/Core/Notifications/AddNotification.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ public AddNotification(string roleName, string message)
4141
Message = message ?? throw new ArgumentNullException("message");
4242
}
4343

44+
/// <summary>
45+
/// Serialization constructor
46+
/// </summary>
47+
protected AddNotification()
48+
{
49+
50+
}
51+
4452
/// <summary>
4553
/// Display only for the specified user.
4654
/// </summary>

‎src/Server/Coderr.Server.Web/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
</runtime>
8787
<system.codedom>
8888
<compilers>
89-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
90-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
89+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
90+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
9191
</compilers>
9292
</system.codedom>
9393
</configuration>

‎src/Server/Coderr.Server.Web/codeRR.Server.Web.csproj‎

Lines changed: 40 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
4-
<Import Project="..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props')" />
3+
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
4+
<Import Project="..\packages\Microsoft.Net.Compilers.2.4.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.4.0\build\Microsoft.Net.Compilers.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,10 +21,9 @@
2121
<RootNamespace>codeRR.Server.Web</RootNamespace>
2222
<SchemaVersion>2.0</SchemaVersion>
2323
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
24-
<TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
2524
<UseGlobalApplicationHostFile />
2625
<UseIISExpress>true</UseIISExpress>
27-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
26+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
2827
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
2928
<Use64BitIISExpress />
3029
</PropertyGroup>
@@ -36,34 +35,22 @@
3635
<Optimize>false</Optimize>
3736
<OutputPath>bin\</OutputPath>
3837
<PublishDatabases>false</PublishDatabases>
39-
<TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
40-
<TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
41-
<TypeScriptJSXEmit>None</TypeScriptJSXEmit>
42-
<TypeScriptMapRoot />
43-
<TypeScriptModuleKind>None</TypeScriptModuleKind>
44-
<TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
45-
<TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
46-
<TypeScriptOutDir />
47-
<TypeScriptOutFile />
48-
<TypeScriptRemoveComments>False</TypeScriptRemoveComments>
49-
<TypeScriptSourceMap>True</TypeScriptSourceMap>
50-
<TypeScriptSourceRoot />
51-
<TypeScriptTarget>ES5</TypeScriptTarget>
5238
<WarningLevel>4</WarningLevel>
53-
<DocumentationFile>
54-
</DocumentationFile>
5539
</PropertyGroup>
5640
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5741
<DebugType>pdbonly</DebugType>
5842
<DefineConstants>TRACE</DefineConstants>
5943
<ErrorReport>prompt</ErrorReport>
6044
<Optimize>true</Optimize>
6145
<OutputPath>bin\</OutputPath>
46+
</PropertyGroup>
47+
<PropertyGroup>
48+
<TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
6249
<TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
6350
<TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
6451
<TypeScriptJSXEmit>None</TypeScriptJSXEmit>
6552
<TypeScriptMapRoot />
66-
<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>
53+
<TypeScriptModuleKind>None</TypeScriptModuleKind>
6754
<TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
6855
<TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
6956
<TypeScriptOutDir />
@@ -72,9 +59,6 @@
7259
<TypeScriptSourceMap>True</TypeScriptSourceMap>
7360
<TypeScriptSourceRoot />
7461
<TypeScriptTarget>ES5</TypeScriptTarget>
75-
<WarningLevel>4</WarningLevel>
76-
<DocumentationFile>
77-
</DocumentationFile>
7862
</PropertyGroup>
7963
<ItemGroup>
8064
<ProjectReference Include="..\Coderr.Server.Api.Client\codeRR.Server.Api.Client.csproj">
@@ -137,10 +121,9 @@
137121
<Reference Include="Microsoft.AspNet.Identity.Owin">
138122
<HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
139123
</Reference>
140-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141-
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
124+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
142126
</Reference>
143-
<Reference Include="Microsoft.CSharp" />
144127
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
145128
<HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
146129
</Reference>
@@ -172,29 +155,16 @@
172155
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
173156
<Private>True</Private>
174157
</Reference>
158+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
159+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
160+
</Reference>
175161
<Reference Include="Owin">
176162
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
177163
</Reference>
178-
<Reference Include="System" />
179-
<Reference Include="System.ComponentModel.DataAnnotations" />
180-
<Reference Include="System.Configuration" />
181-
<Reference Include="System.Core" />
182-
<Reference Include="System.Data" />
183-
<Reference Include="System.Data.DataSetExtensions" />
184-
<Reference Include="System.Drawing" />
185-
<Reference Include="System.Management" />
186-
<Reference Include="System.Messaging" />
187-
<Reference Include="System.Net.Http" />
188164
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
189165
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
190166
<Private>True</Private>
191167
</Reference>
192-
<Reference Include="System.Net.Http.WebRequest" />
193-
<Reference Include="System.Runtime.Serialization" />
194-
<Reference Include="System.Web" />
195-
<Reference Include="System.Web.Abstractions" />
196-
<Reference Include="System.Web.ApplicationServices" />
197-
<Reference Include="System.Web.Entity" />
198168
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
199169
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
200170
<Private>True</Private>
@@ -220,7 +190,6 @@
220190
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
221191
<Private>True</Private>
222192
</Reference>
223-
<Reference Include="System.Web.Routing" />
224193
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
225194
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
226195
<Private>True</Private>
@@ -233,13 +202,33 @@
233202
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
234203
<Private>True</Private>
235204
</Reference>
236-
<Reference Include="System.Xml" />
237-
<Reference Include="System.Xml.Linq" />
238205
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
239206
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
240207
<Private>True</Private>
241208
</Reference>
242209
</ItemGroup>
210+
<ItemGroup>
211+
<Reference Include="Microsoft.CSharp" />
212+
<Reference Include="System" />
213+
<Reference Include="System.ComponentModel.DataAnnotations" />
214+
<Reference Include="System.Configuration" />
215+
<Reference Include="System.Core" />
216+
<Reference Include="System.Data" />
217+
<Reference Include="System.Data.DataSetExtensions" />
218+
<Reference Include="System.Drawing" />
219+
<Reference Include="System.Management" />
220+
<Reference Include="System.Messaging" />
221+
<Reference Include="System.Net.Http" />
222+
<Reference Include="System.Net.Http.WebRequest" />
223+
<Reference Include="System.Runtime.Serialization" />
224+
<Reference Include="System.Web" />
225+
<Reference Include="System.Web.Abstractions" />
226+
<Reference Include="System.Web.ApplicationServices" />
227+
<Reference Include="System.Web.Entity" />
228+
<Reference Include="System.Web.Routing" />
229+
<Reference Include="System.Xml" />
230+
<Reference Include="System.Xml.Linq" />
231+
</ItemGroup>
243232
<ItemGroup>
244233
<Compile Include="AdoNetUowSpy.cs" />
245234
<Compile Include="App_Start\BundleConfig.cs" />
@@ -347,12 +336,6 @@
347336
<Compile Include="Results\ChallengeResult.cs" />
348337
<Compile Include="Startup.cs" />
349338
<Compile Include="Views\BaseViewPage.cs" />
350-
</ItemGroup>
351-
<ItemGroup>
352-
<Folder Include="App_Data\" />
353-
<Folder Include="Areas\Receiver\Views\Shared\" />
354-
</ItemGroup>
355-
<ItemGroup>
356339
<Content Include="Areas\Admin\Views\_ViewStart.cshtml" />
357340
<Content Include="Areas\Admin\Views\ApiKeys\Create.cshtml" />
358341
<Content Include="Areas\Admin\Views\ApiKeys\Created.cshtml" />
@@ -551,8 +534,6 @@
551534
<Content Include="Views\Wizard\Packages.cshtml" />
552535
<Content Include="Views\Wizard\ConfigurePackage.cshtml" />
553536
<Content Include="Views\Wizard\Validate.cshtml" />
554-
</ItemGroup>
555-
<ItemGroup>
556537
<Content Include="Areas\Installation\Views\Setup\Completed.cshtml" />
557538
<Content Include="Areas\Admin\Views\Application\Versions.cshtml" />
558539
<None Include="compilerconfig.json" />
@@ -562,6 +543,10 @@
562543
<Content Include="Scripts\jquery-3.1.1.slim.min.map" />
563544
<Content Include="Scripts\jquery-3.1.1.min.map" />
564545
</ItemGroup>
546+
<ItemGroup>
547+
<Folder Include="App_Data\" />
548+
<Folder Include="Areas\Receiver\Views\Shared\" />
549+
</ItemGroup>
565550
<ItemGroup>
566551
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
567552
</ItemGroup>
@@ -607,9 +592,6 @@
607592
<TypeScriptCompile Include="ViewModels\User\NotificationsViewModel.ts" />
608593
<TypeScriptCompile Include="ViewModels\User\SettingsViewModel.ts" />
609594
</ItemGroup>
610-
<ItemGroup>
611-
<WCFMetadata Include="Service References\" />
612-
</ItemGroup>
613595
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
614596
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
615597
</Target>
@@ -641,8 +623,8 @@
641623
<PropertyGroup>
642624
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
643625
</PropertyGroup>
644-
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props'))" />
645-
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
626+
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.4.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.4.0\build\Microsoft.Net.Compilers.props'))" />
627+
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
646628
</Target>
647629
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
648630
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Server/Coderr.Server.Web/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
2828
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
2929
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
30-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.7" targetFramework="net452" />
30+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net452" />
3131
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net452" />
32-
<package id="Microsoft.Net.Compilers" version="2.3.2" targetFramework="net452" developmentDependency="true" />
32+
<package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net452" developmentDependency="true" />
3333
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net452" />
3434
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net452" />
3535
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net452" />

0 commit comments

Comments
 (0)