Skip to content

Commit c55df5f

Browse files
authored
Merge pull request Azure#217 from arramac/master
fix build
2 parents 6c2f6dd + e80ad38 commit c55df5f

28 files changed

+133
-179
lines changed

samples/ChangeFeedProcessor/DocumentDB.ChangeFeedProcessor.csproj

Lines changed: 0 additions & 127 deletions
This file was deleted.

samples/ChangeFeedProcessor/DocumentDB.ChangeFeedProcessor.sln

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentDB.ChangeFeedProcessor", "DocumentDB.ChangeFeedProcessor.csproj", "{D14CE64B-5267-4539-B61F-36100AED3EE7}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C67BF63E-8757-4124-B822-12C54C0DDABA}"
9-
ProjectSection(SolutionItems) = preProject
10-
.nuget\NuGet.Config = .nuget\NuGet.Config
11-
.nuget\NuGet.exe = .nuget\NuGet.exe
12-
.nuget\NuGet.targets = .nuget\NuGet.targets
13-
EndProjectSection
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentDB.ChangeFeedProcessor", "DocumentDB.ChangeFeedProcessor\DocumentDB.ChangeFeedProcessor.csproj", "{43B55C4C-377C-49EF-9165-337542F4319E}"
147
EndProject
158
Global
169
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17-
Debug|x64 = Debug|x64
18-
Release|x64 = Release|x64
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
1912
EndGlobalSection
2013
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{D14CE64B-5267-4539-B61F-36100AED3EE7}.Debug|x64.ActiveCfg = Debug|x64
22-
{D14CE64B-5267-4539-B61F-36100AED3EE7}.Debug|x64.Build.0 = Debug|x64
23-
{D14CE64B-5267-4539-B61F-36100AED3EE7}.Release|x64.ActiveCfg = Release|x64
24-
{D14CE64B-5267-4539-B61F-36100AED3EE7}.Release|x64.Build.0 = Release|x64
14+
{43B55C4C-377C-49EF-9165-337542F4319E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{43B55C4C-377C-49EF-9165-337542F4319E}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{43B55C4C-377C-49EF-9165-337542F4319E}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{43B55C4C-377C-49EF-9165-337542F4319E}.Release|Any CPU.Build.0 = Release|Any CPU
2518
EndGlobalSection
2619
GlobalSection(SolutionProperties) = preSolution
2720
HideSolutionNode = FALSE
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
5+
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
14+
</configuration>
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
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')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{43B55C4C-377C-49EF-9165-337542F4319E}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>DocumentDB.ChangeFeedProcessor</RootNamespace>
11+
<AssemblyName>DocumentDB.ChangeFeedProcessor</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<PlatformTarget>AnyCPU</PlatformTarget>
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<PlatformTarget>AnyCPU</PlatformTarget>
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>bin\Release\</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
</PropertyGroup>
37+
<PropertyGroup>
38+
<StartupObject />
39+
</PropertyGroup>
40+
<ItemGroup>
41+
<Reference Include="Microsoft.Azure.Documents.Client, Version=1.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Microsoft.Azure.DocumentDB.1.12.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
43+
<Private>True</Private>
44+
</Reference>
45+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
47+
<Private>True</Private>
48+
</Reference>
49+
<Reference Include="System" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="System.Xml.Linq" />
52+
<Reference Include="System.Data.DataSetExtensions" />
53+
<Reference Include="Microsoft.CSharp" />
54+
<Reference Include="System.Data" />
55+
<Reference Include="System.Net.Http" />
56+
<Reference Include="System.Xml" />
57+
</ItemGroup>
58+
<ItemGroup>
59+
<Compile Include="ChangeFeedEventHost.cs" />
60+
<Compile Include="ChangeFeedHostOptions.cs" />
61+
<Compile Include="ChangeFeedObserverCloseReason.cs" />
62+
<Compile Include="ChangeFeedObserverContext.cs" />
63+
<Compile Include="DocumentCollectionInfo.cs" />
64+
<Compile Include="IChangeFeedObserver.cs" />
65+
<Compile Include="Internal\DocumentFeedObserverFactory.cs" />
66+
<Compile Include="Internal\DocumentLeaseStore\DocumentServiceLease.cs" />
67+
<Compile Include="Internal\DocumentLeaseStore\DocumentServiceLeaseManager.cs" />
68+
<Compile Include="Internal\DocumentLeaseStore\LeaseState.cs" />
69+
<Compile Include="Internal\ICheckpointManager.cs" />
70+
<Compile Include="Internal\IDocumentFeedObserverFactory.cs" />
71+
<Compile Include="Internal\ILeaseManager.cs" />
72+
<Compile Include="Internal\IPartitionManager.cs" />
73+
<Compile Include="Internal\IPartitionObserver.cs" />
74+
<Compile Include="Internal\Lease.cs" />
75+
<Compile Include="Internal\LeaseLostException.cs" />
76+
<Compile Include="Internal\PartitionManager.cs" />
77+
<Compile Include="Internal\StatusCode.cs" />
78+
<Compile Include="Internal\TraceLog.cs" />
79+
<Compile Include="Properties\AssemblyInfo.cs" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<None Include="App.config" />
83+
<None Include="packages.config" />
84+
</ItemGroup>
85+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86+
<Import Project="..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets')" />
87+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
88+
<PropertyGroup>
89+
<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>
90+
</PropertyGroup>
91+
<Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets'))" />
92+
</Target>
93+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
94+
Other similar extension points exist, see Microsoft.Common.targets.
95+
<Target Name="BeforeBuild">
96+
</Target>
97+
<Target Name="AfterBuild">
98+
</Target>
99+
-->
100+
</Project>

samples/ChangeFeedProcessor/Properties/AssemblyInfo.cs renamed to samples/ChangeFeedProcessor/DocumentDB.ChangeFeedProcessor/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("DocumentDB.ChangeFeedProcessor")]
13-
[assembly: AssemblyCopyright("Copyright ©Microsoft 2016")]
13+
[assembly: AssemblyCopyright("Copyright © 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -20,7 +20,7 @@
2020
[assembly: ComVisible(false)]
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("95e51eb3-d8e2-4acb-8316-b39869d5d8bd")]
23+
[assembly: Guid("43b55c4c-377c-49ef-9165-337542f4319e")]
2424

2525
// Version information for an assembly consists of the following four values:
2626
//
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.Azure.DocumentDB" version="1.12.0" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
5+
<package id="NuGet.Build" version="2.12.0" targetFramework="net45" />
6+
<package id="NuGet.CommandLine" version="1.0.11220.26" targetFramework="net45" />
7+
<package id="NuGetPowerTools" version="0.29" targetFramework="net45" />
8+
</packages>

samples/ChangeFeedProcessor/app.config

Lines changed: 0 additions & 29 deletions
This file was deleted.

samples/ChangeFeedProcessor/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)