diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-04-29 15:27:14 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-04-29 21:15:16 +0100 |
| commit | ce97e686826147e2a071fd2321555f7d40ec5d93 (patch) | |
| tree | 873c55c5013021255b279ae45034c5276d798838 /csharp/src/AddressBook | |
| parent | a449f66bdb50f3e898889705945fb1ac6b105469 (diff) | |
| download | protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.tar.gz protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.tar.bz2 protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.zip | |
Convert both the full and lite runtimes (and json/xml serialization assemblies) to be Portable Class Libraries.
All referring projects are now .NET 4 client rather than .NET 3.5.
This commit also fixes up the ProtoBench app, which I'd neglected in previous commits. (Disentangling the two sets of changes would be time-consuming.)
Diffstat (limited to 'csharp/src/AddressBook')
| -rw-r--r-- | csharp/src/AddressBook/AddressBook.csproj | 13 | ||||
| -rw-r--r-- | csharp/src/AddressBook/app.config | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/csharp/src/AddressBook/AddressBook.csproj b/csharp/src/AddressBook/AddressBook.csproj index fe05ad6c..52b82a8f 100644 --- a/csharp/src/AddressBook/AddressBook.csproj +++ b/csharp/src/AddressBook/AddressBook.csproj @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
- <EnvironmentTemplate>NET35</EnvironmentTemplate>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -12,16 +10,17 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Google.ProtocolBuffers.Examples.AddressBook</RootNamespace>
<AssemblyName>AddressBook</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>Google.ProtocolBuffers.Examples.AddressBook.Program</StartupObject>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\NET35\Debug</OutputPath>
- <IntermediateOutputPath>obj\NET35\Debug\</IntermediateOutputPath>
+ <OutputPath>bin\Debug</OutputPath>
+ <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -32,8 +31,8 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\NET35\Release</OutputPath>
- <IntermediateOutputPath>obj\NET35\Release\</IntermediateOutputPath>
+ <OutputPath>bin\Release</OutputPath>
+ <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/csharp/src/AddressBook/app.config b/csharp/src/AddressBook/app.config index 0df7832f..19fac17a 100644 --- a/csharp/src/AddressBook/app.config +++ b/csharp/src/AddressBook/app.config @@ -1,3 +1,3 @@ <?xml version="1.0"?> <configuration> - <startup/></configuration> + <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration> |