[c#] Migrate to VS 2017 csproj

- This change will consolidate the .Net Core into the csproj - The new csproj is only supported by VS2017 and the .Net Core SDK tooling - Added new test project coreNS10 to test the Net Standard 1.0 binaries
2018-05-10 09:24:28 -07:00 · 2018-05-10 09:24:28 -07:00 · 3c7bdb9738
--- a/.travis.yml
+++ b/.travis.yml
@ -47,7 +47,7 @@ env:
    - FLAVOR="cpp-grpc-master" BOOST="1.66.0" COMPILER="clang" CRON_ONLY="true"
 script:
    - if [ "$CRON_ONLY" = "true" ] && [ "$TRAVIS_EVENT_TYPE" != "cron" ] ; then echo "Skipping cron-only job"; exit 0; fi
-    - CI_BUILD_IMAGE=bondciimages.azurecr.io/ubuntu-1604:build-12021456
+    - CI_BUILD_IMAGE=bondciimages.azurecr.io/ubuntu-1604:build-13234037
    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo "Hardware:"; grep model\ name /proc/cpuinfo | uniq -c; free -m; fi
    - travis_retry docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" bondciimages.azurecr.io
    - time travis_retry docker pull $CI_BUILD_IMAGE
--- a/README.md
+++ b/README.md
@ -181,10 +181,11 @@ cmake .. \
 Install the following tools:

 - Visual Studio 2013, 2015, or 2017
-    - Visual Studio 2015 is required to build C# Bond from source
+    - VS2017 is required to build C# Bond from source
+- .NET Core SDK ([https://www.microsoft.com/net/core](https://www.microsoft.com/net/core#windows))
+    - Alternative to VS2017 for building C# Bond from source
 - CMake ([http://www.cmake.org/download/](http://www.cmake.org/download/))
 - Haskell Stack ([https://docs.haskellstack.org/en/stable/install_and_upgrade/#windows](https://docs.haskellstack.org/en/stable/install_and_upgrade/#windows))
- .NET Core SDK ([https://www.microsoft.com/net/core](https://www.microsoft.com/net/core#windows))

 If you are building on a network behind a proxy, set the environment variable
 `HTTP_PROXY`, e.g.:
@ -193,15 +194,15 @@ If you are building on a network behind a proxy, set the environment variable
 set HTTP_PROXY=http://your-proxy-name:80
 ```

-Now you are ready to build the C# 4.0/4.5 version of Bond. Open the solution
-file `cs\cs.sln` in Visual Studio and build as usual. The C# unit tests can
+Now you are ready to build the C# version of Bond. Open the solution file
+`cs\cs.sln` in Visual Studio and build as usual. The C# unit tests can
 also be run from within the solution.

-To build the .NET Core version of Bond, run the build script. The `-Test`
-switch is used to run the unit tests as well.
+To build using the .NET Core SDK:

 ```bash
-.\cs\dnc\build -Test
+dotnet restore cs\cs.sln
+dotnet msbuild cs\cs.sln
 ```

 The C++ and Python versions of Bond additionally require:
--- a/appveyor.yml
+++ b/appveyor.yml
@ -57,8 +57,6 @@
            - BOND_BUILD: C#
              BOND_OUTPUT: Properties
              BOND_CONFIG: Debug
-            - BOND_BUILD: "C# .NET Core"
-              BOND_CONFIG: Debug
            - BOND_BUILD: Doc
            - BOND_BUILD: C#
              BOND_OUTPUT: Fields
@ -138,6 +136,8 @@

            choco install haskell-stack -y

+            choco install dotnetcore-sdk -y
+
            # choco install updated the path, so re-read them from the registry and reset $env:path

            $machinePath = [System.Environment]::GetEnvironmentVariable("Path","Machine")
@ -203,7 +203,7 @@

            if ($env:BOND_BUILD -eq "C#" -Or $env:BOND_BUILD -eq "C++") {

-                nuget restore cs\cs.sln
+                dotnet restore cs\cs.sln

            }

@ -235,7 +235,7 @@

                $compatTests = ('Tests\Compat', 'Tests\GrpcCompatClient', 'Tests\GrpcCompatServer')

-                msbuild cs\cs.sln /verbosity:minimal "/target:$($compatTests -join ';')" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+                dotnet msbuild cs\cs.sln /verbosity:minimal "/target:$($compatTests -join ';')"

                if (-not $?) { throw "cs compat build failed" }

@ -311,13 +311,7 @@

            if ($env:BOND_BUILD -eq "C#") {

-                msbuild cs\cs.sln /verbosity:minimal /p:Configuration=${env:BOND_CONFIG} /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-
-            }
-
-            if ($env:BOND_BUILD -eq "C# .NET Core") {
-
-                & cs\dnc\build.ps1 -Configuration $env:BOND_CONFIG -Verbosity minimal -MSBuildLogger "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+                dotnet msbuild cs\cs.sln /verbosity:minimal /p:Configuration=${env:BOND_CONFIG}

            }

@ -333,19 +327,20 @@
            }

            if ($env:BOND_BUILD -eq "C#") {
-                nunit-console-x86 /framework:net-4.5 /labels "cs\test\core\bin\debug\net45\${env:BOND_OUTPUT}\Bond.UnitTest.dll" cs\test\internal\bin\debug\net45\Bond.InternalTest.dll
+                dotnet test cs\test\core\Core.csproj
                if (-not $?) { throw "tests failed" }

-                nunit-console-x86 /framework:net-4.5 /labels "cs\test\core\bin\debug\net45-nonportable\${env:BOND_OUTPUT}\Bond.UnitTest.dll"
+                dotnet test cs\test\coreNS10\CoreNS10.csproj
+                if (-not $?) { throw "tests failed" }
+
+                dotnet test cs\test\internal\Internal.csproj
+                if (-not $?) { throw "tests failed" }
+
+                dotnet test cs\test\grpc\grpc.csproj
                if (-not $?) { throw "tests failed" }

                & cs\test\test-examples.ps1 -IgnorePatterns '*\shared-types-assembly\*' -ErrorVariable exampleErrors
                if ($exampleErrors) { throw "One or more example failed. See above for details." }
            }

-            if ($env:BOND_BUILD -eq "C# .NET Core") {
-                & cs\dnc\build.ps1 -Test -Configuration $env:BOND_CONFIG -Verbosity minimal -MSBuildLogger "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-                if (-not $?) { throw "tests failed" }
-            }
-
            if (-not $?) { throw "build failed" }
--- a/cs/Compiler.csproj
+++ b/cs/Compiler.csproj
@ -80,7 +80,17 @@

    <MakeDir Directories="$(IntermediateOutputPath)" />

-    <Exec Command="cmake $(ProjectDir)\..\compiler -Wno-dev" WorkingDirectory="$(IntermediateOutputPath)" />
+    <!-- In some of the CI build systems we use, Stack isn't on the path.
+         The MSBuild property/environment variable STACK_PATH can be used to
+         specify a location, and we'll forward that on to CMake. -->
+    <PropertyGroup>
+      <_BondCmakeProgramPath></_BondCmakeProgramPath>
+      <!-- We use the \. trick to avoid problems with quoting a quote mark
+           if STACK_PATH ends with a trailing slash. -->
+      <_BondCmakeProgramPath Condition=" '$(STACK_PATH)' != '' ">"-DCMAKE_PROGRAM_PATH=$(STACK_PATH)\."</_BondCmakeProgramPath>
+    </PropertyGroup>
+
+    <Exec Command="cmake $(ProjectDir)\..\compiler $(_BondCmakeProgramPath) -Wno-dev" WorkingDirectory="$(IntermediateOutputPath)" />
    <Exec Command="cmake --build . --config $(BondCompilerCMakeBuildType) --target gbc" WorkingDirectory="$(IntermediateOutputPath)" />

    <Copy SourceFiles="$(IntermediateOutputPath)\build\gbc\gbc.exe" DestinationFolder="$(ProjectDir)\tools\" />
--- a/cs/build/internal/Common.Internal.props
+++ b/cs/build/internal/Common.Internal.props
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
  <PropertyGroup Condition="'$(Configuration)' == ''">
    <Configuration Condition="'$(BuildType)' == 'debug'">Debug</Configuration>
    <Configuration Condition="'$(BuildType)' == 'retail'">Release</Configuration>
@ -9,20 +9,23 @@
    <BOND_INCLUDE_PATH Condition="'$(BOND_INCLUDE_PATH)' == ''">$(MSBuildThisFileDirectory)..\..\..\idl</BOND_INCLUDE_PATH>
  </PropertyGroup>
  <Import Project="..\nuget\Common.props" />
-  <PropertyGroup Condition="'$(BuildFramework)' == ''">
+  <PropertyGroup Condition="'$(BuildFramework)' == '' and '$(UsingMicrosoftNETSdk)' != 'true'">
    <BuildFramework>net45</BuildFramework>
  </PropertyGroup>
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true'">
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
    <OutputPath>bin\$(BuildType)\$(BuildFramework)</OutputPath>
    <IntermediateOutputPath>obj\$(BuildType)\$(BuildFramework)</IntermediateOutputPath>
    <FileAlignment>512</FileAlignment>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
    <NoWarn>1591</NoWarn>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <SignAssembly>true</SignAssembly>
    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)bond.snk</AssemblyOriginatorKeyFile>
+    <!-- We need to disable automatic AssemblyInfo generation to avoid duplication with our AssemblyInfo file -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup>
    <!--Set the version number for auto-generation from the environment
--- a/cs/build/internal/Common.Internal.targets
+++ b/cs/build/internal/Common.Internal.targets
@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition="'$(TargetFrameworkProfile)' != 'Profile78'">
+  <ItemGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true' and '$(TargetFrameworkProfile)' != 'Profile78'">
    <Reference Include="System" />
    <Reference Include="System.Xml" />
  </ItemGroup>
-  <Import Condition="'$(TargetFrameworkProfile)' == 'Profile78'" Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Condition="'$(TargetFrameworkProfile)' != 'Profile78'" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Condition="'$(UsingMicrosoftNETSdk)' != 'true' and '$(TargetFrameworkProfile)' == 'Profile78'" Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Condition="'$(UsingMicrosoftNETSdk)' != 'true' and '$(TargetFrameworkProfile)' != 'Profile78'" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="..\nuget\Common.targets"/>
  <Import Project="Versions.targets" />
  <PropertyGroup>
-    <DocumentationFile>$(OutDir)\$(TargetName).xml</DocumentationFile>
+    <DocumentationFile Condition="'$(UsingMicrosoftNETSdk)' == 'true'">$(BaseOutputPath)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+    <DocumentationFile Condition="'$(UsingMicrosoftNETSdk)' != 'true'">$(OutDir)\$(TargetName).xml</DocumentationFile>
  </PropertyGroup>
  <ItemGroup>
-    <FileToCopy Include="$(TargetDir)\$(TargetName).pdb" Condition="'$(MSBuildRuntimeType)' != 'Mono' or '$(_DebugFileExt)' == '.pdb'" />
-    <FileToCopy Include="$(TargetPath).mdb" Condition="'$(MSBuildRuntimeType)' == 'Mono' and '$(_DebugFileExt)' == '.mdb'" />
-    <FileToCopy Include="$(OutDir)\$(TargetName).xml" />
+    <FileToCopy Include="$(TargetDir)\$(TargetName).pdb" />
+    <FileToCopy Include="$(DocumentationFile)" />
  </ItemGroup>
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="$(TargetPath);@(FileToCopy)" DestinationFolder="$(BOND_BINARY_PATH)\$(BuildFramework)" Condition="'$(BondRedistributable)' == 'true'" />
-    <MSBuild Condition="'$(BuildFramework)' == 'net45' and ('$(HasNonportableVersion)' == 'true')" Projects="$(MSBuildProjectFile)" Properties="BuildNonportable=true" RunEachTargetSeparately="true"  />
+  <Target Name="CopyAdditionalFiles" AfterTargets="AfterBuild">
+    <Copy SourceFiles="$(TargetPath);@(FileToCopy)" DestinationFolder="$(BOND_BINARY_PATH)\$(BuildFramework)\$(TargetFramework)" Condition="'$(BondRedistributable)' == 'true'" />
  </Target>
 </Project>
--- a/cs/build/internal/Portable.Internal.props
+++ b/cs/build/internal/Portable.Internal.props
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)\Common.Internal.props" />
-  <PropertyGroup>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
-  </PropertyGroup>
-</Project>
--- a/cs/build/internal/Versions.targets
+++ b/cs/build/internal/Versions.targets
@ -65,6 +65,7 @@
          BeforeTargets="CoreCompile"
          Condition=" '$(BondVersionNum)' != '' ">
    <Message Text="Generating assembly info with version $(_Bond_FullVersion) at &quot;$(_Bond_GeneratedAssemblyInfoPath)&quot;" />
+    <MakeDir Directories="$(IntermediateOutputPath)"/>
    <WriteLinesToFile
        File="$(_Bond_GeneratedAssemblyInfoPath)"
        Lines="// &lt;autogenerated /&gt;;
--- a/cs/build/nuget/Common.targets
+++ b/cs/build/nuget/Common.targets
@ -24,7 +24,6 @@
  <!-- Set sensible defaults. -->
  <PropertyGroup>
    <BondOptions Condition=" '$(BondOptions)' == '' "></BondOptions>
-    <BondOutputDirectory Condition=" '$(BondOutputDirectory)' == '' ">$(IntermediateOutputPath)</BondOutputDirectory>
    <BondCodegenMode Condition="'$(BondCodegenMode)' == ''">c#</BondCodegenMode>
  </PropertyGroup>

@ -72,17 +71,22 @@
    <UpToDateCheckInput Include="$(_PreExistingBondExe)" />
  </ItemGroup>

-  <PropertyGroup>
-    <!--Automatic directory separator translation doesn't work on
-         BondOutputDirectory, as sometimes it doesn't exist, so MSBuild
-         doesn't know it's a "path-like" thing. We unconditionally translate
-         to forward slashes, as they work Windows, macOS, and Linux. We also
-         ensure that this always has a trailing slash, which simplifies its
-         use later. -->
-    <_BondOutputDirectoryNormalized>$(BondOutputDirectory)</_BondOutputDirectoryNormalized>
-    <_BondOutputDirectoryNormalized Condition=" !HasTrailingSlash('$(_BondOutputDirectoryNormalized)') ">$(BondOutputDirectory)\</_BondOutputDirectoryNormalized>
-    <_BondOutputDirectoryNormalized>$(_BondOutputDirectoryNormalized.Replace('%5C', '%2F'))</_BondOutputDirectoryNormalized>
-  </PropertyGroup>
+  <Target Name="SetBondOutputDirectory"
+          BeforeTargets="BondCodegenCs"
+          Condition="'@(BondCodegen)' != ''">
+    <PropertyGroup>
+      <BondOutputDirectory Condition=" '$(BondOutputDirectory)' == '' ">$(IntermediateOutputPath)</BondOutputDirectory>
+      <!--Automatic directory separator translation doesn't work on
+           BondOutputDirectory, as sometimes it doesn't exist, so MSBuild
+           doesn't know it's a "path-like" thing. We unconditionally translate
+           to forward slashes, as they work Windows, macOS, and Linux. We also
+           ensure that this always has a trailing slash, which simplifies its
+           use later. -->
+      <_BondOutputDirectoryNormalized>$(BondOutputDirectory)</_BondOutputDirectoryNormalized>
+      <_BondOutputDirectoryNormalized Condition=" !HasTrailingSlash('$(_BondOutputDirectoryNormalized)') ">$(BondOutputDirectory)\</_BondOutputDirectoryNormalized>
+      <_BondOutputDirectoryNormalized>$(_BondOutputDirectoryNormalized.Replace('%5C', '%2F'))</_BondOutputDirectoryNormalized>
+    </PropertyGroup>
+  </Target>

  <!-- Fail the build if there are duplicate items in @BondCodegen. This is
       unlikely in classic project files, but is likely to be encountered
--- a/cs/build/nuget/cps/ProjectItemsSchema.xaml
+++ b/cs/build/nuget/cps/ProjectItemsSchema.xaml
@ -10,7 +10,7 @@
    </ContentType>

    <ItemType Name="BondCodegen" DisplayName="Bond code generation"/>
-    <ItemType Name="BondImportDirectory" DisplayName="Bond import search directory"/>
+    <ItemType Name="BondImportDirectory" DisplayName="Bond import search directory" DefaultContentType="Folder"/>

    <FileExtension Name=".bond" ContentType="BondIDL"/>
 </ProjectSchemaDefinitions>
--- a/cs/cs.sln
+++ b/cs/cs.sln
@ -1,23 +1,23 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2043
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Attributes", "src\attributes\Attributes.csproj", "{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Attributes", "src\attributes\Attributes.csproj", "{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bond", "src\core\Bond.csproj", "{43CBBA9B-C4BC-4E64-8733-7B72562D2E91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bond", "src\core\Bond.csproj", "{43CBBA9B-C4BC-4E64-8733-7B72562D2E91}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{21E175D5-BBDD-4B63-8FB7-38899BF2F9D1} = {21E175D5-BBDD-4B63-8FB7-38899BF2F9D1}
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO", "src\io\IO.csproj", "{2E6E238C-9017-445C-9611-66DA780609BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IO", "src\io\IO.csproj", "{2E6E238C-9017-445C-9611-66DA780609BE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSON", "src\json\JSON.csproj", "{C001C79F-D289-4CF3-BB59-5F5A72F70D0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JSON", "src\json\JSON.csproj", "{C001C79F-D289-4CF3-BB59-5F5A72F70D0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 	EndProjectSection
@ -35,7 +35,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "test\compat\core\
 		{C001C79F-D289-4CF3-BB59-5F5A72F70D0E} = {C001C79F-D289-4CF3-BB59-5F5A72F70D0E}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "test\core\Core.csproj", "{FF056B62-225A-47BC-B177-550FADDA4B41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "test\core\Core.csproj", "{FF056B62-225A-47BC-B177-550FADDA4B41}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Expressions", "test\express
 		{C001C79F-D289-4CF3-BB59-5F5A72F70D0E} = {C001C79F-D289-4CF3-BB59-5F5A72F70D0E}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "test\internal\Internal.csproj", "{2994D2BC-2C4A-479E-AD23-051721470095}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internal", "test\internal\Internal.csproj", "{2994D2BC-2C4A-479E-AD23-051721470095}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
@ -134,7 +134,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "serializer", "..\examples\c
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "simple_json", "..\examples\cs\core\simple_json\simple_json.csproj", "{45E4032C-78E1-41DD-8E51-1CC5AD2AEE02}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "simple_json", "..\examples\cs\core\simple_json\simple_json.csproj", "{45E4032C-78E1-41DD-8E51-1CC5AD2AEE02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
@ -176,7 +176,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "enumerations", "..\examples
 		{21E175D5-BBDD-4B63-8FB7-38899BF2F9D1} = {21E175D5-BBDD-4B63-8FB7-38899BF2F9D1}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "reflection", "src\reflection\reflection.csproj", "{40452223-3A34-4841-9A69-E0B6640B4108}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "reflection", "src\reflection\reflection.csproj", "{40452223-3A34-4841-9A69-E0B6640B4108}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "codegen", "codegen", "{8CF1F5CD-548F-4323-869E-AA5903C88B6A}"
 EndProject
@ -186,7 +186,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "output-no-slash", "test\cod
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_pingpong", "..\examples\cs\grpc\pingpong\grpc_pingpong.csproj", "{618420F1-6465-4DF4-BD1B-747765F481FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_pingpong", "..\examples\cs\grpc\pingpong\grpc_pingpong.csproj", "{618420F1-6465-4DF4-BD1B-747765F481FF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -196,7 +196,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_pingpong", "..\example
 		{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA} = {AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc", "src\grpc\grpc.csproj", "{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc", "src\grpc\grpc.csproj", "{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -204,7 +204,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc", "src\grpc\grpc.cspro
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc", "test\grpc\grpc.csproj", "{D5F087E7-1EE9-4AEB-83AF-5F234C69B867}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc", "test\grpc\grpc.csproj", "{D5F087E7-1EE9-4AEB-83AF-5F234C69B867}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -213,25 +213,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc", "test\grpc\grpc.cspr
 		{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA} = {AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcCompatClient", "test\compat\grpc\client\GrpcCompatClient.csproj", "{D82898E8-4695-4233-98C6-1B3624241A2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcCompatClient", "test\compat\grpc\client\GrpcCompatClient.csproj", "{D82898E8-4695-4233-98C6-1B3624241A2D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcCompatServer", "test\compat\grpc\server\GrpcCompatServer.csproj", "{A6D526FD-22B0-4151-9B3E-D20C3C05D81D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcCompatServer", "test\compat\grpc\server\GrpcCompatServer.csproj", "{A6D526FD-22B0-4151-9B3E-D20C3C05D81D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcCompatShared", "test\compat\grpc\shared\GrpcCompatShared.csproj", "{8FC5BF4E-6932-48FC-AA57-3D5F43130699}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcCompatShared", "test\compat\grpc\shared\GrpcCompatShared.csproj", "{8FC5BF4E-6932-48FC-AA57-3D5F43130699}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_scalar", "..\examples\cs\grpc\scalar\grpc_scalar.csproj", "{51F4135B-2CEF-436F-91CE-A6548B37E459}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_scalar", "..\examples\cs\grpc\scalar\grpc_scalar.csproj", "{51F4135B-2CEF-436F-91CE-A6548B37E459}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -246,14 +246,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_sta-types", "..\exampl
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_sta-server", "..\examples\cs\grpc\shared-types-assembly\server\grpc_sta-server.csproj", "{A390B660-5F81-4CD3-B5EF-EB7C1C6B6AFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_sta-server", "..\examples\cs\grpc\shared-types-assembly\server\grpc_sta-server.csproj", "{A390B660-5F81-4CD3-B5EF-EB7C1C6B6AFE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 		{21E175D5-BBDD-4B63-8FB7-38899BF2F9D1} = {21E175D5-BBDD-4B63-8FB7-38899BF2F9D1}
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_sta-client", "..\examples\cs\grpc\shared-types-assembly\client\grpc_sta-client.csproj", "{9DCEAD87-C61F-40D5-989E-0E44F56E01BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_sta-client", "..\examples\cs\grpc\shared-types-assembly\client\grpc_sta-client.csproj", "{9DCEAD87-C61F-40D5-989E-0E44F56E01BE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
 		{21E175D5-BBDD-4B63-8FB7-38899BF2F9D1} = {21E175D5-BBDD-4B63-8FB7-38899BF2F9D1}
@ -308,7 +308,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "schema_view", "..\examples\
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_streaming", "..\examples\cs\grpc\streaming\grpc_streaming.csproj", "{5C6BAEFE-9F72-451E-85CC-F4521E92AEB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_streaming", "..\examples\cs\grpc\streaming\grpc_streaming.csproj", "{5C6BAEFE-9F72-451E-85CC-F4521E92AEB9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -317,7 +317,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_streaming", "..\exampl
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_generics", "..\examples\cs\grpc\generics\grpc_generics.csproj", "{6887352A-4071-46D6-B095-2514985A3AB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "grpc_generics", "..\examples\cs\grpc\generics\grpc_generics.csproj", "{6887352A-4071-46D6-B095-2514985A3AB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{40452223-3A34-4841-9A69-E0B6640B4108} = {40452223-3A34-4841-9A69-E0B6640B4108}
 		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
@ -326,6 +326,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grpc_generics", "..\example
 		{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreNS10", "test\coreNS10\CoreNS10.csproj", "{3805B86E-2BE3-4FFA-A11C-B4981069EC88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
+		{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
+		{C001C79F-D289-4CF3-BB59-5F5A72F70D0E} = {C001C79F-D289-4CF3-BB59-5F5A72F70D0E}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -1140,6 +1147,24 @@ Global
 		{6887352A-4071-46D6-B095-2514985A3AB6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6887352A-4071-46D6-B095-2514985A3AB6}.Release|Win32.ActiveCfg = Release|Any CPU
 		{6887352A-4071-46D6-B095-2514985A3AB6}.Release|Win32.Build.0 = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Win32.Build.0 = Debug|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Any CPU.ActiveCfg = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Any CPU.Build.0 = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Mixed Platforms.ActiveCfg = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Mixed Platforms.Build.0 = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Win32.ActiveCfg = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Win32.Build.0 = Fields|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Win32.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -1188,6 +1213,7 @@ Global
 		{4FACD9A1-B8AC-4D76-B4B5-B71607EA8F8C} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
 		{5C6BAEFE-9F72-451E-85CC-F4521E92AEB9} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
 		{6887352A-4071-46D6-B095-2514985A3AB6} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
+		{3805B86E-2BE3-4FFA-A11C-B4981069EC88} = {4268A1D3-AF40-4120-B021-D95A0F754221}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6EB58560-CA9C-4F6C-B916-CCA6C7FE2A2B}
--- a/cs/dnc/.gitignore
+++ b/cs/dnc/.gitignore
@ -1,5 +0,0 @@
-*.nuget.props
-*.nuget.targets
-*project.lock.json
-/gen/
-TestResult.xml
--- a/cs/dnc/build.cmd
+++ b/cs/dnc/build.cmd
@ -1,2 +0,0 @@
-@call powershell -ExecutionPolicy RemoteSigned -NoLogo -NoProfile -File "%~dp0\build.ps1" %*
-@if %errorlevel% neq 0 exit /b %errorlevel%
--- a/cs/dnc/build.ps1
+++ b/cs/dnc/build.ps1
@ -1,190 +0,0 @@
-<#
-.SYNOPSIS
-
-Builds Bond with the .NET Core toolchain
-
-.PARAMETER Configuration
-
-The configuration to build. Valid values are:
- debug
- release
-
-.PARAMETER Test
-
-Whether to run the tests.
-
-.PARAMETER Verbosity
-
-The verbosity of the build process. Valid values are, in increasing order of
-verbosity:
- quiet
- minimal
- normal
- detailed
-
-.PARAMETER MSBuildLogger
-
-An optional logger to pass to MSBuild. Consult the MSBuild help for the
-switch /logger: for details about the syntax.
-
-.EXAMPLE
-
-PS c:\src\bond\cs\dnc> .\build.ps1
-
-This will build just the debug configuration.
-
-.EXAMPLE
-
-PS c:\src\bond> .\cs\dnc\build.ps1 -Configuration release -Test
-
-This will build the release configuration and run all the test projects.
-
-#>
-[CmdletBinding()]
-param
-(
-    [ValidateSet("debug", "release")]
-    [string]
-    $Configuration = "debug",
-
-    [switch]
-    $Test = $false,
-
-    [string]
-    $Version = "",
-
-    [ValidateSet("quiet", "minimal", "normal", "detailed")]
-    [string]
-    $Verbosity = "minimal",
-
-    [string]
-    $MSBuildLogger = ""
-)
-
-Set-StrictMode -Version Latest
-$ErrorActionPreference = 'Stop'
-
-function ComputeMSBuildVerbosity() {
-    # The set of values we use map directly to MSBuild levels.
-    $Verbosity
-}
-
-function ComputeDotNetRestoreVerbosity() {
-    switch ($Verbosity) {
-        'quiet' { 'minimal' }
-        'minimal' { 'minimal' }
-        'normal' { 'information' }
-        'detailed' { 'debug' }
-    }
-}
-
-try
-{
-    $script:msb_common = ("/m", "/verbosity:$(ComputeMSBuildVerbosity)")
-    if ($MSBuildLogger) {
-        $script:msb_common += "/logger:$($MSBuildLogger)"
-    }
-
-    # We push to a stack other than the default one so that we don't
-    # accidentally change its contents.
-    #
-    # We have to set our location to the same directory as this script as
-    # dotnet globbing doesn't work with paths like
-    # c:\src\bond\cs\dnc\**\project.json
-    $script:script_dir = Split-Path -LiteralPath $PSCommandPath
-    Push-Location -Path (Split-Path -LiteralPath $PSCommandPath) -StackName bond_dnc_build
-
-    msbuild $script:msb_common /p:Configuration=$Configuration /p:Platform=Win32 '..\Compiler.csproj'
-    if (-not $?) {
-        throw "Building GBC failed."
-    }
-
-    mkdir -Force gen
-
-    if ([string]::IsNullOrWhiteSpace($Version)) {
-        Copy-Item '..\build\internal\DevVersions.cs' '.\gen\AssemblyInfo_Generated.cs'
-        if (-not $?) {
-            throw "Version copy failed"
-        }
-    } else {
-        $genFullPath = (Resolve-Path gen\).Path
-        msbuild $script:msb_common /p:BondVersionNum=$Version "/p:IntermediateOutputPath=$genFullPath\" '..\build\internal\Versions.targets'
-        if (-not $?) {
-            throw "Version generation failed"
-        }
-    }
-
-    msbuild $script:msb_common /p:Configuration=$Configuration 'dirs.proj'
-    if (-not $?) {
-        throw "Bond code generation failed."
-    }
-
-    dotnet restore --verbosity (ComputeDotNetRestoreVerbosity)
-    if (-not $?) {
-        throw "Package restore failed."
-    }
-
-    # Due to a bug in the way 'dotnet build' resolves project references, we
-    # need to list out the projects in the order that they need to be build.
-    # Otherwise, dotnet tried to build projects before their dependencies
-    # are built.
-    #
-    # See also: https://github.com/dotnet/cli/issues/2639
-    dotnet build --configuration $Configuration `
-      '.\src\attributes\project.json' `
-      '.\src\reflection\project.json' `
-      '.\src\core\project.json' `
-      '.\src\io\project.json' `
-      '.\src\json\project.json' `
-      '.\src\grpc\project.json' `
-      '.\test\core.tests\project.json' `
-      '.\test\internal.tests\project.json' `
-      '.\test\expressions.tests\project.json' `
-      '.\test\grpc.tests\project.json' `
-      '.\test\compat\compat.core.tests\project.json' `
-      '.\test\codegen\no-warnings.tests\project.json' `
-      '**\project.json'
-
-    if (-not $?) {
-        throw ".NET Core build failed."
-    }
-
-    $script:to_publish = (
-        @{'source'='attributes'; 'files'='Bond.Attributes.*'},
-        @{'source'='core'; 'files'='Bond.*'},
-        @{'source'='grpc'; 'files'='Bond.Grpc.*'},
-        @{'source'='io'; 'files'='Bond.IO.*'},
-        @{'source'='json'; 'files'='Bond.JSON.*'},
-        @{'source'='reflection'; 'files'='Bond.Reflection.*'}
-    )
-
-    $script:publish_dir = "bin\$Configuration\"
-    mkdir -Force $script:publish_dir
-    if (-not $?) {
-        throw "Creating of publish directory '$script:publish_dir' failed"
-    }
-
-    $script:to_publish | foreach {
-        $source_xcopy_path = "src\$($psitem.source)\bin\$Configuration\*$($psitem.files)"
-        xcopy /i /s /y $source_xcopy_path $script:publish_dir
-        if (-not $?) {
-            throw "Copying files '$source_xcopy_path' failed"
-        }
-    }
-
-    if ($Test) {
-        $testProjectJsonPaths =  Get-ChildItem -File -Recurse project.json |
-          Select-String 'testRunner' |
-          Select-Object -ExpandProperty Path |
-          Select-Object -Unique
-
-        $testProjectJsonPaths | foreach {
-            dotnet test --no-build --configuration $Configuration $psitem
-            if (-not $?) {
-                throw "Tests failed for $psitem"
-            }
-        }
-    }
-} finally {
-    Pop-Location -StackName bond_dnc_build
-}
--- a/cs/dnc/dirs.proj
+++ b/cs/dnc/dirs.proj
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="GenAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup>
-    <CodegenProjects Include="**\*.codegen.proj" />
-  </ItemGroup>
-
-  <Target Name="GenAll">
-    <MSBuild Projects="@(CodegenProjects)" BuildInParallel="true" />
-  </Target>
-</Project>
--- a/cs/dnc/global.json
+++ b/cs/dnc/global.json
@ -1,9 +0,0 @@
-{
-    "projects": [
-        "src",
-        "test"
-    ],
-    "sdk": {
-        "version": "1.0.0-preview2-003131"
-    }
-}
--- a/cs/dnc/src/attributes/project.json
+++ b/cs/dnc/src/attributes/project.json
@ -1,45 +0,0 @@
-{
-    "name": "Bond.Attributes",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../src/attributes/*.cs",
-                "../../../src/attributes/properties/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "frameworks": {
-        "netstandard1.0": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/src/core/.gitignore
+++ b/cs/dnc/src/core/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/src/core/core.codegen.proj
+++ b/cs/dnc/src/core/core.codegen.proj
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BOND_INCLUDE_PATH>..\..\..\..\idl</BOND_INCLUDE_PATH>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="$(BOND_INCLUDE_PATH)\bond\core\bond.bond" />
-    <BondCodegen Include="$(BOND_INCLUDE_PATH)\bond\core\bond_const.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/src/core/project.json
+++ b/cs/dnc/src/core/project.json
@ -1,57 +0,0 @@
-{
-    "name": "Bond",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../src/core/*.cs",
-                "../../../src/core/expressions/*.cs",
-                "../../../src/core/expressions/pull/*.cs",
-                "../../../src/core/expressions/xml/*.cs",
-                "../../../src/core/io/*.cs",
-                "../../../src/core/io/safe/*.cs",
-                "../../../src/core/properties/*.cs",
-                "../../../src/core/protocols/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs",
-                "gen/bond_const_types.cs",
-                "gen/bond_types.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netstandard1.0": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/src/grpc/project.json
+++ b/cs/dnc/src/grpc/project.json
@ -1,49 +0,0 @@
-{
-    "name": "Bond.Grpc",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../src/grpc/*.cs",
-                "../../../src/grpc/properties/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "Grpc.Core": {
-            "version": "1.10.0"
-        },
-        "io": "1.0.0-*",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.1"
-            }
-        }
-    }
-}
--- a/cs/dnc/src/io/project.json
+++ b/cs/dnc/src/io/project.json
@ -1,51 +0,0 @@
-{
-    "name": "Bond.IO",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "allowUnsafe": true,
-        "compile": {
-            "include": [
-                "../../../src/io/unsafe/*.cs",
-                "../../../src/io/properties/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netstandard1.3": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/src/json/project.json
+++ b/cs/dnc/src/json/project.json
@ -1,60 +0,0 @@
-{
-    "name": "Bond.JSON",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../src/json/*.cs",
-                "../../../src/json/expressions/json/*.cs",
-                "../../../src/json/properties/*.cs",
-                "../../../src/json/protocols/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "reflection": "1.0.0-*",
-        "Newtonsoft.Json": {
-            "version": "9.0.1"
-        }
-    },
-    "frameworks": {
-        "netstandard1.0": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "buildOptions": {
-                "define": [
-                    "SUPPORTS_BIGINTEGER"
-                ]
-            },
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/src/reflection/project.json
+++ b/cs/dnc/src/reflection/project.json
@ -1,45 +0,0 @@
-{
-    "name": "Bond.Reflection",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../src/reflection/*.cs",
-                "../../../src/reflection/properties/*.cs",
-                "../../gen/AssemblyInfo_Generated.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "frameworks": {
-        "netstandard1.0": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/test/codegen/no-warnings.tests/.gitignore
+++ b/cs/dnc/test/codegen/no-warnings.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/codegen/no-warnings.tests/no-warnings.tests.codegen.proj
+++ b/cs/dnc/test/codegen/no-warnings.tests/no-warnings.tests.codegen.proj
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\..\test\codegen\no-warnings\simple.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/codegen/no-warnings.tests/project.json
+++ b/cs/dnc/test/codegen/no-warnings.tests/project.json
@ -1,46 +0,0 @@
-{
-    "name": "Bond.CodegenTest.NoWarnings",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*"
-    },
-    "frameworks": {
-        "netstandard1.0": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        },
-        "netstandard1.6": {
-            "dependencies": {
-                "NETStandard.Library": "1.6.0"
-            }
-        }
-    }
-}
--- a/cs/dnc/test/compat/compat.core.tests/.gitignore
+++ b/cs/dnc/test/compat/compat.core.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/compat/compat.core.tests/compat.core.tests.codegen.proj
+++ b/cs/dnc/test/compat/compat.core.tests/compat.core.tests.codegen.proj
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\..\..\test\compat\core\schemas\compat.bond" />
-    <BondCodegen Include="..\..\..\..\..\test\compat\core\schemas\compat2.bond" />
-    <BondCodegen Include="..\..\..\..\..\test\compat\core\schemas\compat_common.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/compat/compat.core.tests/project.json
+++ b/cs/dnc/test/compat/compat.core.tests/project.json
@ -1,54 +0,0 @@
-{
-    "name": "Bond.CompatibilityTest",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../../test/compat/core/*.cs",
-                "../../../../test/compat/core/properties/*.cs",
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "portable",
-        "emitEntryPoint": true,
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "io": "1.0.0-*",
-        "json": "1.0.0-*"
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "imports": [
-                "netcoreapp1.0",
-                "portable-net45+win8"
-            ],
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0-*",
-                    "type": "platform"
-                }
-            }
-        }
-    }
-}
--- a/cs/dnc/test/core.tests/.gitignore
+++ b/cs/dnc/test/core.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/core.tests/core.tests.codegen.proj
+++ b/cs/dnc/test/core.tests/core.tests.codegen.proj
@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BOND_INCLUDE_PATH>..\..\..\..\idl</BOND_INCLUDE_PATH>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondImportDirectory Include="..\..\..\test\core\import dir with spaces\" />
-  </ItemGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\test\core\Aliases.bond">
-      <Options>$(BondOptions) --using="Lazy=Lazy&lt;{0}&gt;" --using="OrderedSet=SortedSet&lt;{0}&gt;" --using="Decimal=decimal" --using="EnumString=Alias.EnumString&lt;{0}&gt;" --using="Array={0}[]" --using=ArrayBlob=byte[] --using="CustomList=UnitTest.Aliases.SomeCustomList&lt;{0}&gt;"</Options>
-    </BondCodegen>
-    <BondCodegen Include="..\..\..\test\core\NamespaceConflict.bond" />
-    <BondCodegen Include="..\..\..\test\core\NamespaceConflictBond.bond" />
-    <BondCodegen Include="..\..\..\test\core\ReadOnly.bond">
-      <Options>$(BondOptions) --readonly-properties</Options>
-    </BondCodegen>
-    <BondCodegen Include="..\..\..\test\core\Containers.bond">
-      <Options>$(BondOptions) --collection-interfaces</Options>
-    </BondCodegen>
-    <BondCodegen Include="..\..\..\test\core\UnitTest.bond">
-      <Options>$(BondOptions) --using="DateTime=System.DateTime"</Options>
-    </BondCodegen>
-    <BondCodegen Include="..\..\..\test\core\import dir with spaces\Bond File With Spaces.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/core.tests/project.json
+++ b/cs/dnc/test/core.tests/project.json
@ -1,65 +0,0 @@
-{
-    "name": "Bond.UnitTest",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../test/core/*.cs",
-                "../../../test/core/properties/*.cs",
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "net45",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "dotnet-test-nunit": "3.4.0-beta-1",
-        "io": "1.0.0-*",
-        "json": "1.0.0-*",
-        "NUnit": "3.4.0",
-        "reflection": "1.0.0-*",
-        "Newtonsoft.Json": {
-            "version": "10.0.1"
-        }
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "imports": [
-                "netcoreapp1.0",
-                "portable-net45+win8"
-            ],
-            "buildOptions": {
-                "define": [
-                    "SUPPORTS_BIGINTEGER"
-                ]
-            },
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0-*",
-                    "type": "platform"
-                }
-            }
-        }
-    },
-    "testRunner": "nunit"
-}
--- a/cs/dnc/test/expressions.tests/.gitignore
+++ b/cs/dnc/test/expressions.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/expressions.tests/DeserializeCB.expressions
+++ b/cs/dnc/test/expressions.tests/DeserializeCB.expressions
--- a/cs/dnc/test/expressions.tests/DeserializeJson.expressions
+++ b/cs/dnc/test/expressions.tests/DeserializeJson.expressions
--- a/cs/dnc/test/expressions.tests/DeserializeSP.expressions
+++ b/cs/dnc/test/expressions.tests/DeserializeSP.expressions
@ -1,256 +0,0 @@
-.Lambda #Lambda1<System.Func`2[Bond.Protocols.SimpleBinaryReader`1[Bond.IO.Unsafe.InputStream],System.Object]>(Bond.Protocols.SimpleBinaryReader`1[Bond.IO.Unsafe.InputStream] $reader)
-{
-    .Block(ExpressionsTest.Example $Example) {
-        .Block() {
-            $Example = .New ExpressionsTest.Example();
-            .Block() {
-                .Default(System.Void);
-                .Block() {
-                    .Block() {
-                        .Default(System.Void);
-                        .If (
-                            .Call $reader.ReadFieldOmitted()
-                        ) {
-                            .Default(System.Void)
-                        } .Else {
-                            .Block(System.Int32 $count) {
-                                $count = .Call $reader.ReadContainerBegin();
-                                .Block(System.Collections.Generic.List`1[System.UInt64] $Convert(Example).vvb_item) {
-                                    (((ExpressionsTest.Base)$Example).vvb).Capacity = $count;
-                                    .Loop  {
-                                        .If ($count-- > 0) {
-                                            .Block() {
-                                                .Block(System.Int32 $count) {
-                                                    $count = .Call $reader.ReadContainerBegin();
-                                                    .Block(System.UInt64 $Convert(Example).vvb_item_item) {
-                                                        $Convert(Example).vvb_item = .New System.Collections.Generic.List`1[System.UInt64]($count);
-                                                        .Loop  {
-                                                            .If ($count-- > 0) {
-                                                                .Block() {
-                                                                    $Convert(Example).vvb_item_item = .Call $reader.ReadUInt64();
-                                                                    .Call $Convert(Example).vvb_item.Add($Convert(Example).vvb_item_item)
-                                                                }
-                                                            } .Else {
-                                                                .Break end { }
-                                                            }
-                                                        }
-                                                        .LabelTarget end:;
-                                                        .Default(System.Void)
-                                                    };
-                                                    .Call $reader.ReadContainerEnd()
-                                                };
-                                                .Call (((ExpressionsTest.Base)$Example).vvb).Add($Convert(Example).vvb_item)
-                                            }
-                                        } .Else {
-                                            .Break end { }
-                                        }
-                                    }
-                                    .LabelTarget end:;
-                                    .Default(System.Void)
-                                };
-                                .Call $reader.ReadContainerEnd()
-                            }
-                        };
-                        .Default(System.Void)
-                    }
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    $Example._bool = .Call $reader.ReadBool()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    $Example._str = .Call $reader.ReadString()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    $Example._uint32 = .Call $reader.ReadUInt32()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    $Example._int8 = .Call $reader.ReadInt8()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Invoke (.Lambda #Lambda2<System.Action`2[System.String,System.String]>)(
-                        "Example",
-                        "_int64")
-                } .Else {
-                    $Example._int64 = .Call $reader.ReadInt64()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    $Example._double = .Call $reader.ReadDouble()
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    .Block() {
-                        .Block() {
-                            .Default(System.Void);
-                            .If (
-                                .Call $reader.ReadFieldOmitted()
-                            ) {
-                                .Default(System.Void)
-                            } .Else {
-                                ($Example.guid).Data1 = .Call $reader.ReadUInt32()
-                            };
-                            .If (
-                                .Call $reader.ReadFieldOmitted()
-                            ) {
-                                .Default(System.Void)
-                            } .Else {
-                                ($Example.guid).Data2 = .Call $reader.ReadUInt16()
-                            };
-                            .If (
-                                .Call $reader.ReadFieldOmitted()
-                            ) {
-                                .Default(System.Void)
-                            } .Else {
-                                ($Example.guid).Data3 = .Call $reader.ReadUInt16()
-                            };
-                            .If (
-                                .Call $reader.ReadFieldOmitted()
-                            ) {
-                                .Default(System.Void)
-                            } .Else {
-                                ($Example.guid).Data4 = .Call $reader.ReadUInt64()
-                            };
-                            .Default(System.Void)
-                        }
-                    }
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    .Block(System.Int32 $count) {
-                        $count = .Call $reader.ReadContainerBegin();
-                        .Block(System.Int32 $Example._int32Vector_item) {
-                            ($Example._int32Vector).Capacity = $count;
-                            .Loop  {
-                                .If ($count-- > 0) {
-                                    .Block() {
-                                        $Example._int32Vector_item = .Call $reader.ReadInt32();
-                                        .Call ($Example._int32Vector).Add($Example._int32Vector_item)
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Default(System.Void)
-                        };
-                        .Call $reader.ReadContainerEnd()
-                    }
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    .Block(System.Int32 $count) {
-                        $count = .Call $reader.ReadContainerBegin();
-                        .Block(ExpressionsTest.Nested $Example._nestedVector_item) {
-                            .Default(System.Void);
-                            .Loop  {
-                                .If ($count-- > 0) {
-                                    .Block() {
-                                        .Block() {
-                                            $Example._nestedVector_item = .New ExpressionsTest.Nested();
-                                            .Block() {
-                                                .Default(System.Void);
-                                                .If (
-                                                    .Call $reader.ReadFieldOmitted()
-                                                ) {
-                                                    .Default(System.Void)
-                                                } .Else {
-                                                    $Example._nestedVector_item._double = .Call $reader.ReadDouble()
-                                                };
-                                                .Default(System.Void)
-                                            }
-                                        };
-                                        .Call ($Example._nestedVector).Add($Example._nestedVector_item)
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Default(System.Void)
-                        };
-                        .Call $reader.ReadContainerEnd()
-                    }
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    .Block(System.Int32 $count) {
-                        $count = .Call $reader.ReadContainerBegin();
-                        $Example.b = .Call $reader.ReadBytes($count);
-                        .Call $reader.ReadContainerEnd()
-                    }
-                };
-                .If (
-                    .Call $reader.ReadFieldOmitted()
-                ) {
-                    .Default(System.Void)
-                } .Else {
-                    .Block(System.Int32 $count) {
-                        $count = .Call $reader.ReadContainerBegin();
-                        .Block(
-                            System.Int32 $Example._map_key,
-                            System.Double $Example._map_value) {
-                            .Default(System.Void);
-                            .Loop  {
-                                .If ($count-- > 0) {
-                                    .Block() {
-                                        $Example._map_key = .Call $reader.ReadInt32();
-                                        .Default(System.Void);
-                                        $Example._map_value = .Call $reader.ReadDouble();
-                                        ($Example._map).Item[$Example._map_key] = $Example._map_value
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:
-                        };
-                        .Call $reader.ReadContainerEnd()
-                    }
-                };
-                .Default(System.Void)
-            }
-        };
-        (System.Object)$Example
-    }
-}
-
-.Lambda #Lambda2<System.Action`2[System.String,System.String]>(
-    System.String $s,
-    System.String $f) {
-    .Call Bond.Expressions.ThrowExpression.ThrowRequiredFieldMissingException(
-        $s,
-        $f)
-}
--- a/cs/dnc/test/expressions.tests/DeserializeXml.expressions
+++ b/cs/dnc/test/expressions.tests/DeserializeXml.expressions
--- a/cs/dnc/test/expressions.tests/SerializeCB.expressions
+++ b/cs/dnc/test/expressions.tests/SerializeCB.expressions
@ -1,406 +0,0 @@
-.Lambda #Lambda1<System.Action`2[System.Object,Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    System.Object $obj,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block(ExpressionsTest.Example $Example) {
-        $Example = (ExpressionsTest.Example)$obj;
-        .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Example));
-        .Block(ExpressionsTest.Base $Base) {
-            $Base = (ExpressionsTest.Base)$obj;
-            .Call $writer.WriteBaseBegin(.Constant<Bond.Metadata>(Base));
-            .If (($Base.vvb).Count != 0) {
-                .Block() {
-                    .Call $writer.WriteFieldBegin(
-                        .Constant<Bond.BondDataType>(BT_LIST),
-                        .Constant<System.UInt16>(0),
-                        .Constant<Bond.Metadata>(vvb));
-                    .Block(
-                        System.Int32 $index,
-                        System.Int32 $count) {
-                        $index = -1;
-                        $count = ($Base.vvb).Count;
-                        .Block() {
-                            .Call $writer.WriteContainerBegin(
-                                $count,
-                                .Constant<Bond.BondDataType>(BT_LIST));
-                            .Loop  {
-                                .If (++$index < $count) {
-                                    .Block() {
-                                        .Default(System.Void);
-                                        .Block(
-                                            System.Int32 $index,
-                                            System.Int32 $count) {
-                                            $index = -1;
-                                            $count = (($Base.vvb).Item[$index]).Count;
-                                            .Block() {
-                                                .Call $writer.WriteContainerBegin(
-                                                    $count,
-                                                    .Constant<Bond.BondDataType>(BT_UINT64));
-                                                .Loop  {
-                                                    .If (++$index < $count) {
-                                                        .Block() {
-                                                            .Default(System.Void);
-                                                            .Call $writer.WriteUInt64((($Base.vvb).Item[$index]).Item[$index]);
-                                                            .Default(System.Void)
-                                                        }
-                                                    } .Else {
-                                                        .Break end { }
-                                                    }
-                                                }
-                                                .LabelTarget end:;
-                                                .Call $writer.WriteContainerEnd()
-                                            }
-                                        };
-                                        .Default(System.Void)
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Call $writer.WriteContainerEnd()
-                        }
-                    };
-                    .Call $writer.WriteFieldEnd()
-                }
-            } .Else {
-                .Call $writer.WriteFieldOmitted(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(vvb))
-            };
-            .Call $writer.WriteBaseEnd()
-        };
-        .If ($Example._bool != False) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_BOOL),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(_bool));
-                .Call $writer.WriteBool($Example._bool);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_BOOL),
-                .Constant<System.UInt16>(0),
-                .Constant<Bond.Metadata>(_bool))
-        };
-        .If ($Example._str != "") {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_STRING),
-                    .Constant<System.UInt16>(2),
-                    .Constant<Bond.Metadata>(_str));
-                .Call $writer.WriteString($Example._str);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_STRING),
-                .Constant<System.UInt16>(2),
-                .Constant<Bond.Metadata>(_str))
-        };
-        .If ($Example._uint32 != 0U) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_UINT32),
-                    .Constant<System.UInt16>(12),
-                    .Constant<Bond.Metadata>(_uint32));
-                .Call $writer.WriteUInt32($Example._uint32);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_UINT32),
-                .Constant<System.UInt16>(12),
-                .Constant<Bond.Metadata>(_uint32))
-        };
-        .If ($Example._int8 != .Constant<System.SByte>(0)) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_INT8),
-                    .Constant<System.UInt16>(14),
-                    .Constant<Bond.Metadata>(_int8));
-                .Call $writer.WriteInt8($Example._int8);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_INT8),
-                .Constant<System.UInt16>(14),
-                .Constant<Bond.Metadata>(_int8))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_INT64),
-                .Constant<System.UInt16>(17),
-                .Constant<Bond.Metadata>(_int64));
-            .Call $writer.WriteInt64($Example._int64);
-            .Call $writer.WriteFieldEnd()
-        };
-        .If ($Example._double != 0D) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                    .Constant<System.UInt16>(18),
-                    .Constant<Bond.Metadata>(_double));
-                .Call $writer.WriteDouble($Example._double);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_DOUBLE),
-                .Constant<System.UInt16>(18),
-                .Constant<Bond.Metadata>(_double))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_STRUCT),
-                .Constant<System.UInt16>(20),
-                .Constant<Bond.Metadata>(guid));
-            .Block(System.Object $obj) {
-                $obj = (System.Object)$Example.guid;
-                .Block(Bond.GUID $GUID) {
-                    $GUID = (Bond.GUID)$obj;
-                    .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(GUID));
-                    .If ($GUID.Data1 != 0U) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT32),
-                                .Constant<System.UInt16>(0),
-                                .Constant<Bond.Metadata>(Data1));
-                            .Call $writer.WriteUInt32($GUID.Data1);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT32),
-                            .Constant<System.UInt16>(0),
-                            .Constant<Bond.Metadata>(Data1))
-                    };
-                    .If ($GUID.Data2 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(1),
-                                .Constant<Bond.Metadata>(Data2));
-                            .Call $writer.WriteUInt16($GUID.Data2);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(1),
-                            .Constant<Bond.Metadata>(Data2))
-                    };
-                    .If ($GUID.Data3 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(2),
-                                .Constant<Bond.Metadata>(Data3));
-                            .Call $writer.WriteUInt16($GUID.Data3);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(2),
-                            .Constant<Bond.Metadata>(Data3))
-                    };
-                    .If ($GUID.Data4 != 0UL) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT64),
-                                .Constant<System.UInt16>(3),
-                                .Constant<Bond.Metadata>(Data4));
-                            .Call $writer.WriteUInt64($GUID.Data4);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT64),
-                            .Constant<System.UInt16>(3),
-                            .Constant<Bond.Metadata>(Data4))
-                    };
-                    .Call $writer.WriteStructEnd()
-                }
-            };
-            .Call $writer.WriteFieldEnd()
-        };
-        .If (($Example._int32Vector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(30),
-                    .Constant<Bond.Metadata>(_int32Vector));
-                .Block(
-                    System.Int32 $index,
-                    System.Int32 $count) {
-                    $index = -1;
-                    $count = ($Example._int32Vector).Count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT32));
-                        .Loop  {
-                            .If (++$index < $count) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(($Example._int32Vector).Item[$index]);
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(30),
-                .Constant<Bond.Metadata>(_int32Vector))
-        };
-        .If (($Example._nestedVector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(40),
-                    .Constant<Bond.Metadata>(_nestedVector));
-                .Block(System.Collections.Generic.LinkedListNode`1[ExpressionsTest.Nested] $node) {
-                    $node = null;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._nestedVector).Count,
-                            .Constant<Bond.BondDataType>(BT_STRUCT));
-                        .Loop  {
-                            .If (.If ($node == null) {
-                                $node = ($Example._nestedVector).First
-                            } .Else {
-                                $node = $node.Next
-                            } != null) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Block(System.Object $obj) {
-                                        $obj = (System.Object)$node.Value;
-                                        .Block(ExpressionsTest.Nested $Nested) {
-                                            $Nested = (ExpressionsTest.Nested)$obj;
-                                            .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Nested));
-                                            .If ($Nested._double != 0D) {
-                                                .Block() {
-                                                    .Call $writer.WriteFieldBegin(
-                                                        .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                        .Constant<System.UInt16>(0),
-                                                        .Constant<Bond.Metadata>(_double));
-                                                    .Call $writer.WriteDouble($Nested._double);
-                                                    .Call $writer.WriteFieldEnd()
-                                                }
-                                            } .Else {
-                                                .Call $writer.WriteFieldOmitted(
-                                                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                    .Constant<System.UInt16>(0),
-                                                    .Constant<Bond.Metadata>(_double))
-                                            };
-                                            .Call $writer.WriteStructEnd()
-                                        }
-                                    };
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(40),
-                .Constant<Bond.Metadata>(_nestedVector))
-        };
-        .If ($Example.b != .Default(System.ArraySegment`1[System.Byte])) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(50),
-                    .Constant<Bond.Metadata>(b));
-                .Block(
-                    System.ArraySegment`1[System.Byte] $arraySegment,
-                    System.Int32 $count,
-                    System.Int32 $index,
-                    System.Int32 $end) {
-                    $arraySegment = $Example.b;
-                    $index = $arraySegment.Offset;
-                    $count = $arraySegment.Count;
-                    $end = $index + $count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT8));
-                        .Call $writer.WriteBytes($Example.b);
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(50),
-                .Constant<Bond.Metadata>(b))
-        };
-        .If (($Example._map).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_MAP),
-                    .Constant<System.UInt16>(60),
-                    .Constant<Bond.Metadata>(_map));
-                .Block(System.Collections.Generic.IEnumerator`1[System.Collections.Generic.KeyValuePair`2[System.Int32,System.Double]] $enumerator)
-                 {
-                    $enumerator = .Call ($Example._map).GetEnumerator();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._map).Count,
-                            .Constant<Bond.BondDataType>(BT_INT32),
-                            .Constant<Bond.BondDataType>(BT_DOUBLE));
-                        .Loop  {
-                            .If (
-                                .Call $enumerator.MoveNext()
-                            ) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(($enumerator.Current).Key);
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Call $writer.WriteDouble(($enumerator.Current).Value);
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_MAP),
-                .Constant<System.UInt16>(60),
-                .Constant<Bond.Metadata>(_map))
-        };
-        .Call $writer.WriteStructEnd()
-    }
-}
--- a/cs/dnc/test/expressions.tests/SerializeSP.expressions
+++ b/cs/dnc/test/expressions.tests/SerializeSP.expressions
@ -1,406 +0,0 @@
-.Lambda #Lambda1<System.Action`2[System.Object,Bond.Protocols.SimpleBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    System.Object $obj,
-    Bond.Protocols.SimpleBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block(ExpressionsTest.Example $Example) {
-        $Example = (ExpressionsTest.Example)$obj;
-        .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Example));
-        .Block(ExpressionsTest.Base $Base) {
-            $Base = (ExpressionsTest.Base)$obj;
-            .Call $writer.WriteBaseBegin(.Constant<Bond.Metadata>(Base));
-            .If (($Base.vvb).Count != 0) {
-                .Block() {
-                    .Call $writer.WriteFieldBegin(
-                        .Constant<Bond.BondDataType>(BT_LIST),
-                        .Constant<System.UInt16>(0),
-                        .Constant<Bond.Metadata>(vvb));
-                    .Block(
-                        System.Int32 $index,
-                        System.Int32 $count) {
-                        $index = -1;
-                        $count = ($Base.vvb).Count;
-                        .Block() {
-                            .Call $writer.WriteContainerBegin(
-                                $count,
-                                .Constant<Bond.BondDataType>(BT_LIST));
-                            .Loop  {
-                                .If (++$index < $count) {
-                                    .Block() {
-                                        .Default(System.Void);
-                                        .Block(
-                                            System.Int32 $index,
-                                            System.Int32 $count) {
-                                            $index = -1;
-                                            $count = (($Base.vvb).Item[$index]).Count;
-                                            .Block() {
-                                                .Call $writer.WriteContainerBegin(
-                                                    $count,
-                                                    .Constant<Bond.BondDataType>(BT_UINT64));
-                                                .Loop  {
-                                                    .If (++$index < $count) {
-                                                        .Block() {
-                                                            .Default(System.Void);
-                                                            .Call $writer.WriteUInt64((($Base.vvb).Item[$index]).Item[$index]);
-                                                            .Default(System.Void)
-                                                        }
-                                                    } .Else {
-                                                        .Break end { }
-                                                    }
-                                                }
-                                                .LabelTarget end:;
-                                                .Call $writer.WriteContainerEnd()
-                                            }
-                                        };
-                                        .Default(System.Void)
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Call $writer.WriteContainerEnd()
-                        }
-                    };
-                    .Call $writer.WriteFieldEnd()
-                }
-            } .Else {
-                .Call $writer.WriteFieldOmitted(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(vvb))
-            };
-            .Call $writer.WriteBaseEnd()
-        };
-        .If ($Example._bool != False) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_BOOL),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(_bool));
-                .Call $writer.WriteBool($Example._bool);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_BOOL),
-                .Constant<System.UInt16>(0),
-                .Constant<Bond.Metadata>(_bool))
-        };
-        .If ($Example._str != "") {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_STRING),
-                    .Constant<System.UInt16>(2),
-                    .Constant<Bond.Metadata>(_str));
-                .Call $writer.WriteString($Example._str);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_STRING),
-                .Constant<System.UInt16>(2),
-                .Constant<Bond.Metadata>(_str))
-        };
-        .If ($Example._uint32 != 0U) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_UINT32),
-                    .Constant<System.UInt16>(12),
-                    .Constant<Bond.Metadata>(_uint32));
-                .Call $writer.WriteUInt32($Example._uint32);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_UINT32),
-                .Constant<System.UInt16>(12),
-                .Constant<Bond.Metadata>(_uint32))
-        };
-        .If ($Example._int8 != .Constant<System.SByte>(0)) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_INT8),
-                    .Constant<System.UInt16>(14),
-                    .Constant<Bond.Metadata>(_int8));
-                .Call $writer.WriteInt8($Example._int8);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_INT8),
-                .Constant<System.UInt16>(14),
-                .Constant<Bond.Metadata>(_int8))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_INT64),
-                .Constant<System.UInt16>(17),
-                .Constant<Bond.Metadata>(_int64));
-            .Call $writer.WriteInt64($Example._int64);
-            .Call $writer.WriteFieldEnd()
-        };
-        .If ($Example._double != 0D) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                    .Constant<System.UInt16>(18),
-                    .Constant<Bond.Metadata>(_double));
-                .Call $writer.WriteDouble($Example._double);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_DOUBLE),
-                .Constant<System.UInt16>(18),
-                .Constant<Bond.Metadata>(_double))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_STRUCT),
-                .Constant<System.UInt16>(20),
-                .Constant<Bond.Metadata>(guid));
-            .Block(System.Object $obj) {
-                $obj = (System.Object)$Example.guid;
-                .Block(Bond.GUID $GUID) {
-                    $GUID = (Bond.GUID)$obj;
-                    .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(GUID));
-                    .If ($GUID.Data1 != 0U) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT32),
-                                .Constant<System.UInt16>(0),
-                                .Constant<Bond.Metadata>(Data1));
-                            .Call $writer.WriteUInt32($GUID.Data1);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT32),
-                            .Constant<System.UInt16>(0),
-                            .Constant<Bond.Metadata>(Data1))
-                    };
-                    .If ($GUID.Data2 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(1),
-                                .Constant<Bond.Metadata>(Data2));
-                            .Call $writer.WriteUInt16($GUID.Data2);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(1),
-                            .Constant<Bond.Metadata>(Data2))
-                    };
-                    .If ($GUID.Data3 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(2),
-                                .Constant<Bond.Metadata>(Data3));
-                            .Call $writer.WriteUInt16($GUID.Data3);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(2),
-                            .Constant<Bond.Metadata>(Data3))
-                    };
-                    .If ($GUID.Data4 != 0UL) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT64),
-                                .Constant<System.UInt16>(3),
-                                .Constant<Bond.Metadata>(Data4));
-                            .Call $writer.WriteUInt64($GUID.Data4);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT64),
-                            .Constant<System.UInt16>(3),
-                            .Constant<Bond.Metadata>(Data4))
-                    };
-                    .Call $writer.WriteStructEnd()
-                }
-            };
-            .Call $writer.WriteFieldEnd()
-        };
-        .If (($Example._int32Vector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(30),
-                    .Constant<Bond.Metadata>(_int32Vector));
-                .Block(
-                    System.Int32 $index,
-                    System.Int32 $count) {
-                    $index = -1;
-                    $count = ($Example._int32Vector).Count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT32));
-                        .Loop  {
-                            .If (++$index < $count) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(($Example._int32Vector).Item[$index]);
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(30),
-                .Constant<Bond.Metadata>(_int32Vector))
-        };
-        .If (($Example._nestedVector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(40),
-                    .Constant<Bond.Metadata>(_nestedVector));
-                .Block(System.Collections.Generic.LinkedListNode`1[ExpressionsTest.Nested] $node) {
-                    $node = null;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._nestedVector).Count,
-                            .Constant<Bond.BondDataType>(BT_STRUCT));
-                        .Loop  {
-                            .If (.If ($node == null) {
-                                $node = ($Example._nestedVector).First
-                            } .Else {
-                                $node = $node.Next
-                            } != null) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Block(System.Object $obj) {
-                                        $obj = (System.Object)$node.Value;
-                                        .Block(ExpressionsTest.Nested $Nested) {
-                                            $Nested = (ExpressionsTest.Nested)$obj;
-                                            .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Nested));
-                                            .If ($Nested._double != 0D) {
-                                                .Block() {
-                                                    .Call $writer.WriteFieldBegin(
-                                                        .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                        .Constant<System.UInt16>(0),
-                                                        .Constant<Bond.Metadata>(_double));
-                                                    .Call $writer.WriteDouble($Nested._double);
-                                                    .Call $writer.WriteFieldEnd()
-                                                }
-                                            } .Else {
-                                                .Call $writer.WriteFieldOmitted(
-                                                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                    .Constant<System.UInt16>(0),
-                                                    .Constant<Bond.Metadata>(_double))
-                                            };
-                                            .Call $writer.WriteStructEnd()
-                                        }
-                                    };
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(40),
-                .Constant<Bond.Metadata>(_nestedVector))
-        };
-        .If ($Example.b != .Default(System.ArraySegment`1[System.Byte])) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(50),
-                    .Constant<Bond.Metadata>(b));
-                .Block(
-                    System.ArraySegment`1[System.Byte] $arraySegment,
-                    System.Int32 $count,
-                    System.Int32 $index,
-                    System.Int32 $end) {
-                    $arraySegment = $Example.b;
-                    $index = $arraySegment.Offset;
-                    $count = $arraySegment.Count;
-                    $end = $index + $count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT8));
-                        .Call $writer.WriteBytes($Example.b);
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(50),
-                .Constant<Bond.Metadata>(b))
-        };
-        .If (($Example._map).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_MAP),
-                    .Constant<System.UInt16>(60),
-                    .Constant<Bond.Metadata>(_map));
-                .Block(System.Collections.Generic.IEnumerator`1[System.Collections.Generic.KeyValuePair`2[System.Int32,System.Double]] $enumerator)
-                 {
-                    $enumerator = .Call ($Example._map).GetEnumerator();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._map).Count,
-                            .Constant<Bond.BondDataType>(BT_INT32),
-                            .Constant<Bond.BondDataType>(BT_DOUBLE));
-                        .Loop  {
-                            .If (
-                                .Call $enumerator.MoveNext()
-                            ) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(($enumerator.Current).Key);
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Call $writer.WriteDouble(($enumerator.Current).Value);
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_MAP),
-                .Constant<System.UInt16>(60),
-                .Constant<Bond.Metadata>(_map))
-        };
-        .Call $writer.WriteStructEnd()
-    }
-}
--- a/cs/dnc/test/expressions.tests/SerializeXml.expressions
+++ b/cs/dnc/test/expressions.tests/SerializeXml.expressions
@ -1,406 +0,0 @@
-.Lambda #Lambda1<System.Action`2[System.Object,Bond.Protocols.SimpleXmlWriter]>(
-    System.Object $obj,
-    Bond.Protocols.SimpleXmlWriter $writer) {
-    .Block(ExpressionsTest.Example $Example) {
-        $Example = (ExpressionsTest.Example)$obj;
-        .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Example));
-        .Block(ExpressionsTest.Base $Base) {
-            $Base = (ExpressionsTest.Base)$obj;
-            .Call $writer.WriteBaseBegin(.Constant<Bond.Metadata>(Base));
-            .If (($Base.vvb).Count != 0) {
-                .Block() {
-                    .Call $writer.WriteFieldBegin(
-                        .Constant<Bond.BondDataType>(BT_LIST),
-                        .Constant<System.UInt16>(0),
-                        .Constant<Bond.Metadata>(vvb));
-                    .Block(
-                        System.Int32 $index,
-                        System.Int32 $count) {
-                        $index = -1;
-                        $count = ($Base.vvb).Count;
-                        .Block() {
-                            .Call $writer.WriteContainerBegin(
-                                $count,
-                                .Constant<Bond.BondDataType>(BT_LIST));
-                            .Loop  {
-                                .If (++$index < $count) {
-                                    .Block() {
-                                        .Call $writer.WriteItemBegin();
-                                        .Block(
-                                            System.Int32 $index,
-                                            System.Int32 $count) {
-                                            $index = -1;
-                                            $count = (($Base.vvb).Item[$index]).Count;
-                                            .Block() {
-                                                .Call $writer.WriteContainerBegin(
-                                                    $count,
-                                                    .Constant<Bond.BondDataType>(BT_UINT64));
-                                                .Loop  {
-                                                    .If (++$index < $count) {
-                                                        .Block() {
-                                                            .Call $writer.WriteItemBegin();
-                                                            .Call $writer.WriteUInt64((($Base.vvb).Item[$index]).Item[$index]);
-                                                            .Call $writer.WriteItemEnd()
-                                                        }
-                                                    } .Else {
-                                                        .Break end { }
-                                                    }
-                                                }
-                                                .LabelTarget end:;
-                                                .Call $writer.WriteContainerEnd()
-                                            }
-                                        };
-                                        .Call $writer.WriteItemEnd()
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Call $writer.WriteContainerEnd()
-                        }
-                    };
-                    .Call $writer.WriteFieldEnd()
-                }
-            } .Else {
-                .Call $writer.WriteFieldOmitted(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(vvb))
-            };
-            .Call $writer.WriteBaseEnd()
-        };
-        .If ($Example._bool != False) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_BOOL),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(_bool));
-                .Call $writer.WriteBool($Example._bool);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_BOOL),
-                .Constant<System.UInt16>(0),
-                .Constant<Bond.Metadata>(_bool))
-        };
-        .If ($Example._str != "") {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_STRING),
-                    .Constant<System.UInt16>(2),
-                    .Constant<Bond.Metadata>(_str));
-                .Call $writer.WriteString($Example._str);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_STRING),
-                .Constant<System.UInt16>(2),
-                .Constant<Bond.Metadata>(_str))
-        };
-        .If ($Example._uint32 != 0U) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_UINT32),
-                    .Constant<System.UInt16>(12),
-                    .Constant<Bond.Metadata>(_uint32));
-                .Call $writer.WriteUInt32($Example._uint32);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_UINT32),
-                .Constant<System.UInt16>(12),
-                .Constant<Bond.Metadata>(_uint32))
-        };
-        .If ($Example._int8 != .Constant<System.SByte>(0)) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_INT8),
-                    .Constant<System.UInt16>(14),
-                    .Constant<Bond.Metadata>(_int8));
-                .Call $writer.WriteInt8($Example._int8);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_INT8),
-                .Constant<System.UInt16>(14),
-                .Constant<Bond.Metadata>(_int8))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_INT64),
-                .Constant<System.UInt16>(17),
-                .Constant<Bond.Metadata>(_int64));
-            .Call $writer.WriteInt64($Example._int64);
-            .Call $writer.WriteFieldEnd()
-        };
-        .If ($Example._double != 0D) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                    .Constant<System.UInt16>(18),
-                    .Constant<Bond.Metadata>(_double));
-                .Call $writer.WriteDouble($Example._double);
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_DOUBLE),
-                .Constant<System.UInt16>(18),
-                .Constant<Bond.Metadata>(_double))
-        };
-        .Block() {
-            .Call $writer.WriteFieldBegin(
-                .Constant<Bond.BondDataType>(BT_STRUCT),
-                .Constant<System.UInt16>(20),
-                .Constant<Bond.Metadata>(guid));
-            .Block(System.Object $obj) {
-                $obj = (System.Object)$Example.guid;
-                .Block(Bond.GUID $GUID) {
-                    $GUID = (Bond.GUID)$obj;
-                    .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(GUID));
-                    .If ($GUID.Data1 != 0U) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT32),
-                                .Constant<System.UInt16>(0),
-                                .Constant<Bond.Metadata>(Data1));
-                            .Call $writer.WriteUInt32($GUID.Data1);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT32),
-                            .Constant<System.UInt16>(0),
-                            .Constant<Bond.Metadata>(Data1))
-                    };
-                    .If ($GUID.Data2 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(1),
-                                .Constant<Bond.Metadata>(Data2));
-                            .Call $writer.WriteUInt16($GUID.Data2);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(1),
-                            .Constant<Bond.Metadata>(Data2))
-                    };
-                    .If ($GUID.Data3 != .Constant<System.UInt16>(0)) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(2),
-                                .Constant<Bond.Metadata>(Data3));
-                            .Call $writer.WriteUInt16($GUID.Data3);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(2),
-                            .Constant<Bond.Metadata>(Data3))
-                    };
-                    .If ($GUID.Data4 != 0UL) {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT64),
-                                .Constant<System.UInt16>(3),
-                                .Constant<Bond.Metadata>(Data4));
-                            .Call $writer.WriteUInt64($GUID.Data4);
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    } .Else {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT64),
-                            .Constant<System.UInt16>(3),
-                            .Constant<Bond.Metadata>(Data4))
-                    };
-                    .Call $writer.WriteStructEnd()
-                }
-            };
-            .Call $writer.WriteFieldEnd()
-        };
-        .If (($Example._int32Vector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(30),
-                    .Constant<Bond.Metadata>(_int32Vector));
-                .Block(
-                    System.Int32 $index,
-                    System.Int32 $count) {
-                    $index = -1;
-                    $count = ($Example._int32Vector).Count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT32));
-                        .Loop  {
-                            .If (++$index < $count) {
-                                .Block() {
-                                    .Call $writer.WriteItemBegin();
-                                    .Call $writer.WriteInt32(($Example._int32Vector).Item[$index]);
-                                    .Call $writer.WriteItemEnd()
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(30),
-                .Constant<Bond.Metadata>(_int32Vector))
-        };
-        .If (($Example._nestedVector).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(40),
-                    .Constant<Bond.Metadata>(_nestedVector));
-                .Block(System.Collections.Generic.LinkedListNode`1[ExpressionsTest.Nested] $node) {
-                    $node = null;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._nestedVector).Count,
-                            .Constant<Bond.BondDataType>(BT_STRUCT));
-                        .Loop  {
-                            .If (.If ($node == null) {
-                                $node = ($Example._nestedVector).First
-                            } .Else {
-                                $node = $node.Next
-                            } != null) {
-                                .Block() {
-                                    .Call $writer.WriteItemBegin();
-                                    .Block(System.Object $obj) {
-                                        $obj = (System.Object)$node.Value;
-                                        .Block(ExpressionsTest.Nested $Nested) {
-                                            $Nested = (ExpressionsTest.Nested)$obj;
-                                            .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Nested));
-                                            .If ($Nested._double != 0D) {
-                                                .Block() {
-                                                    .Call $writer.WriteFieldBegin(
-                                                        .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                        .Constant<System.UInt16>(0),
-                                                        .Constant<Bond.Metadata>(_double));
-                                                    .Call $writer.WriteDouble($Nested._double);
-                                                    .Call $writer.WriteFieldEnd()
-                                                }
-                                            } .Else {
-                                                .Call $writer.WriteFieldOmitted(
-                                                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                    .Constant<System.UInt16>(0),
-                                                    .Constant<Bond.Metadata>(_double))
-                                            };
-                                            .Call $writer.WriteStructEnd()
-                                        }
-                                    };
-                                    .Call $writer.WriteItemEnd()
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(40),
-                .Constant<Bond.Metadata>(_nestedVector))
-        };
-        .If ($Example.b != .Default(System.ArraySegment`1[System.Byte])) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(50),
-                    .Constant<Bond.Metadata>(b));
-                .Block(
-                    System.ArraySegment`1[System.Byte] $arraySegment,
-                    System.Int32 $count,
-                    System.Int32 $index,
-                    System.Int32 $end) {
-                    $arraySegment = $Example.b;
-                    $index = $arraySegment.Offset;
-                    $count = $arraySegment.Count;
-                    $end = $index + $count;
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT8));
-                        .Call $writer.WriteBytes($Example.b);
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(50),
-                .Constant<Bond.Metadata>(b))
-        };
-        .If (($Example._map).Count != 0) {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_MAP),
-                    .Constant<System.UInt16>(60),
-                    .Constant<Bond.Metadata>(_map));
-                .Block(System.Collections.Generic.IEnumerator`1[System.Collections.Generic.KeyValuePair`2[System.Int32,System.Double]] $enumerator)
-                 {
-                    $enumerator = .Call ($Example._map).GetEnumerator();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            ($Example._map).Count,
-                            .Constant<Bond.BondDataType>(BT_INT32),
-                            .Constant<Bond.BondDataType>(BT_DOUBLE));
-                        .Loop  {
-                            .If (
-                                .Call $enumerator.MoveNext()
-                            ) {
-                                .Block() {
-                                    .Call $writer.WriteItemBegin();
-                                    .Call $writer.WriteInt32(($enumerator.Current).Key);
-                                    .Call $writer.WriteItemEnd();
-                                    .Default(System.Void);
-                                    .Call $writer.WriteItemBegin();
-                                    .Call $writer.WriteDouble(($enumerator.Current).Value);
-                                    .Call $writer.WriteItemEnd()
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    }
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        } .Else {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_MAP),
-                .Constant<System.UInt16>(60),
-                .Constant<Bond.Metadata>(_map))
-        };
-        .Call $writer.WriteStructEnd()
-    }
-}
--- a/cs/dnc/test/expressions.tests/TranscodeCBCB.expressions
+++ b/cs/dnc/test/expressions.tests/TranscodeCBCB.expressions
@ -1,335 +0,0 @@
-.Lambda #Lambda1<System.Action`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $reader,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block(
-        Bond.BondDataType $fieldType,
-        System.UInt16 $fieldId) {
-        .Call $reader.ReadStructBegin();
-        .Call $writer.WriteStructBegin(null);
-        .Default(System.Void);
-        .Call $reader.ReadFieldBegin(
-            $fieldType,
-            $fieldId);
-        .Loop  {
-            .If ($fieldType != .Constant<Bond.BondDataType>(BT_STOP)) {
-                .Block() {
-                    .If ($fieldType == .Constant<Bond.BondDataType>(BT_STOP_BASE)) {
-                        .Call $writer.WriteBaseEnd()
-                    } .Else {
-                        .Block() {
-                            .Block() {
-                                .Call $writer.WriteFieldBegin(
-                                    $fieldType,
-                                    $fieldId,
-                                    null);
-                                .Switch ($fieldType) {
-                                .Case (.Constant<Bond.BondDataType>(BT_LIST)):
-                                .Case (.Constant<Bond.BondDataType>(BT_SET)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            1)
-                                .Case (.Constant<Bond.BondDataType>(BT_MAP)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            2)
-                                .Case (.Constant<Bond.BondDataType>(BT_STRUCT)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            0)
-                                .Case (.Constant<Bond.BondDataType>(BT_BOOL)):
-                                        .Call $writer.WriteBool(.Call $reader.ReadBool())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT8)):
-                                        .Call $writer.WriteUInt8(.Call $reader.ReadUInt8())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT16)):
-                                        .Call $writer.WriteUInt16(.Call $reader.ReadUInt16())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT32)):
-                                        .Call $writer.WriteUInt32(.Call $reader.ReadUInt32())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT64)):
-                                        .Call $writer.WriteUInt64(.Call $reader.ReadUInt64())
-                                .Case (.Constant<Bond.BondDataType>(BT_FLOAT)):
-                                        .Call $writer.WriteFloat(.Call $reader.ReadFloat())
-                                .Case (.Constant<Bond.BondDataType>(BT_DOUBLE)):
-                                        .Call $writer.WriteDouble(.Call $reader.ReadDouble())
-                                .Case (.Constant<Bond.BondDataType>(BT_STRING)):
-                                        .Call $writer.WriteString(.Call $reader.ReadString())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT8)):
-                                        .Call $writer.WriteInt8(.Call $reader.ReadInt8())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT16)):
-                                        .Call $writer.WriteInt16(.Call $reader.ReadInt16())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT32)):
-                                        .Call $writer.WriteInt32(.Call $reader.ReadInt32())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT64)):
-                                        .Call $writer.WriteInt64(.Call $reader.ReadInt64())
-                                .Case (.Constant<Bond.BondDataType>(BT_WSTRING)):
-                                        .Call $writer.WriteWString(.Call $reader.ReadWString())
-                                .Default:
-                                        .Invoke (.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>)($fieldType)
-                                };
-                                .Call $writer.WriteFieldEnd()
-                            };
-                            .Call $reader.ReadFieldEnd()
-                        }
-                    };
-                    .Call $reader.ReadFieldBegin(
-                        $fieldType,
-                        $fieldId)
-                }
-            } .Else {
-                .Break end { }
-            }
-        }
-        .LabelTarget end:;
-        .Call $reader.ReadStructEnd();
-        .Call $writer.WriteStructEnd()
-    }
-}
-
-.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $r,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $w,
-    System.Int32 $i) {
-    .Invoke ((.Constant<ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]).transcode)[$i])(
-        $r,
-        $w)
-}
-
-.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>(Bond.BondDataType $t) {
-    .Call Bond.Expressions.ThrowExpression.ThrowInvalidTypeException($t)
-}.Lambda #Lambda1<System.Action`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $reader,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block(
-        System.Int32 $count,
-        Bond.BondDataType $elementType) {
-        .Call $reader.ReadContainerBegin(
-            $count,
-            $elementType);
-        .Block() {
-            .Call $writer.WriteContainerBegin(
-                $count,
-                $elementType);
-            .If ($elementType == .Constant<Bond.BondDataType>(BT_UINT8)) {
-                .Call $writer.WriteBytes(.Call $reader.ReadBytes($count))
-            } .Else {
-                .If ($elementType == .Constant<Bond.BondDataType>(BT_INT8)) {
-                    .Call $writer.WriteBytes(.Call $reader.ReadBytes($count))
-                } .Else {
-                    .Loop  {
-                        .If ($count-- > 0) {
-                            .Block() {
-                                .Default(System.Void);
-                                .Switch ($elementType) {
-                                .Case (.Constant<Bond.BondDataType>(BT_LIST)):
-                                .Case (.Constant<Bond.BondDataType>(BT_SET)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            1)
-                                .Case (.Constant<Bond.BondDataType>(BT_MAP)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            2)
-                                .Case (.Constant<Bond.BondDataType>(BT_STRUCT)):
-                                        .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                            $reader,
-                                            $writer,
-                                            0)
-                                .Case (.Constant<Bond.BondDataType>(BT_BOOL)):
-                                        .Call $writer.WriteBool(.Call $reader.ReadBool())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT8)):
-                                        .Call $writer.WriteUInt8(.Call $reader.ReadUInt8())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT16)):
-                                        .Call $writer.WriteUInt16(.Call $reader.ReadUInt16())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT32)):
-                                        .Call $writer.WriteUInt32(.Call $reader.ReadUInt32())
-                                .Case (.Constant<Bond.BondDataType>(BT_UINT64)):
-                                        .Call $writer.WriteUInt64(.Call $reader.ReadUInt64())
-                                .Case (.Constant<Bond.BondDataType>(BT_FLOAT)):
-                                        .Call $writer.WriteFloat(.Call $reader.ReadFloat())
-                                .Case (.Constant<Bond.BondDataType>(BT_DOUBLE)):
-                                        .Call $writer.WriteDouble(.Call $reader.ReadDouble())
-                                .Case (.Constant<Bond.BondDataType>(BT_STRING)):
-                                        .Call $writer.WriteString(.Call $reader.ReadString())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT8)):
-                                        .Call $writer.WriteInt8(.Call $reader.ReadInt8())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT16)):
-                                        .Call $writer.WriteInt16(.Call $reader.ReadInt16())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT32)):
-                                        .Call $writer.WriteInt32(.Call $reader.ReadInt32())
-                                .Case (.Constant<Bond.BondDataType>(BT_INT64)):
-                                        .Call $writer.WriteInt64(.Call $reader.ReadInt64())
-                                .Case (.Constant<Bond.BondDataType>(BT_WSTRING)):
-                                        .Call $writer.WriteWString(.Call $reader.ReadWString())
-                                .Default:
-                                        .Invoke (.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>)($elementType)
-                                };
-                                .Default(System.Void)
-                            }
-                        } .Else {
-                            .Break end { }
-                        }
-                    }
-                    .LabelTarget end:
-                }
-            };
-            .Call $writer.WriteContainerEnd()
-        };
-        .Call $reader.ReadContainerEnd()
-    }
-}
-
-.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $r,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $w,
-    System.Int32 $i) {
-    .Invoke ((.Constant<ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]).transcode)[$i])(
-        $r,
-        $w)
-}
-
-.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>(Bond.BondDataType $t) {
-    .Call Bond.Expressions.ThrowExpression.ThrowInvalidTypeException($t)
-}.Lambda #Lambda1<System.Action`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $reader,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block(
-        System.Int32 $count,
-        Bond.BondDataType $keyType,
-        Bond.BondDataType $valueType) {
-        .Call $reader.ReadContainerBegin(
-            $count,
-            $keyType,
-            $valueType);
-        .Block() {
-            .Call $writer.WriteContainerBegin(
-                $count,
-                $keyType,
-                $valueType);
-            .Loop  {
-                .If ($count-- > 0) {
-                    .Block() {
-                        .Default(System.Void);
-                        .Switch ($keyType) {
-                        .Case (.Constant<Bond.BondDataType>(BT_LIST)):
-                        .Case (.Constant<Bond.BondDataType>(BT_SET)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    1)
-                        .Case (.Constant<Bond.BondDataType>(BT_MAP)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    2)
-                        .Case (.Constant<Bond.BondDataType>(BT_STRUCT)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    0)
-                        .Case (.Constant<Bond.BondDataType>(BT_BOOL)):
-                                .Call $writer.WriteBool(.Call $reader.ReadBool())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT8)):
-                                .Call $writer.WriteUInt8(.Call $reader.ReadUInt8())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT16)):
-                                .Call $writer.WriteUInt16(.Call $reader.ReadUInt16())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT32)):
-                                .Call $writer.WriteUInt32(.Call $reader.ReadUInt32())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT64)):
-                                .Call $writer.WriteUInt64(.Call $reader.ReadUInt64())
-                        .Case (.Constant<Bond.BondDataType>(BT_FLOAT)):
-                                .Call $writer.WriteFloat(.Call $reader.ReadFloat())
-                        .Case (.Constant<Bond.BondDataType>(BT_DOUBLE)):
-                                .Call $writer.WriteDouble(.Call $reader.ReadDouble())
-                        .Case (.Constant<Bond.BondDataType>(BT_STRING)):
-                                .Call $writer.WriteString(.Call $reader.ReadString())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT8)):
-                                .Call $writer.WriteInt8(.Call $reader.ReadInt8())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT16)):
-                                .Call $writer.WriteInt16(.Call $reader.ReadInt16())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT32)):
-                                .Call $writer.WriteInt32(.Call $reader.ReadInt32())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT64)):
-                                .Call $writer.WriteInt64(.Call $reader.ReadInt64())
-                        .Case (.Constant<Bond.BondDataType>(BT_WSTRING)):
-                                .Call $writer.WriteWString(.Call $reader.ReadWString())
-                        .Default:
-                                .Invoke (.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>)($keyType)
-                        };
-                        .Default(System.Void);
-                        .Default(System.Void);
-                        .Default(System.Void);
-                        .Switch ($valueType) {
-                        .Case (.Constant<Bond.BondDataType>(BT_LIST)):
-                        .Case (.Constant<Bond.BondDataType>(BT_SET)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    1)
-                        .Case (.Constant<Bond.BondDataType>(BT_MAP)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    2)
-                        .Case (.Constant<Bond.BondDataType>(BT_STRUCT)):
-                                .Invoke (.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>)(
-                                    $reader,
-                                    $writer,
-                                    0)
-                        .Case (.Constant<Bond.BondDataType>(BT_BOOL)):
-                                .Call $writer.WriteBool(.Call $reader.ReadBool())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT8)):
-                                .Call $writer.WriteUInt8(.Call $reader.ReadUInt8())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT16)):
-                                .Call $writer.WriteUInt16(.Call $reader.ReadUInt16())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT32)):
-                                .Call $writer.WriteUInt32(.Call $reader.ReadUInt32())
-                        .Case (.Constant<Bond.BondDataType>(BT_UINT64)):
-                                .Call $writer.WriteUInt64(.Call $reader.ReadUInt64())
-                        .Case (.Constant<Bond.BondDataType>(BT_FLOAT)):
-                                .Call $writer.WriteFloat(.Call $reader.ReadFloat())
-                        .Case (.Constant<Bond.BondDataType>(BT_DOUBLE)):
-                                .Call $writer.WriteDouble(.Call $reader.ReadDouble())
-                        .Case (.Constant<Bond.BondDataType>(BT_STRING)):
-                                .Call $writer.WriteString(.Call $reader.ReadString())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT8)):
-                                .Call $writer.WriteInt8(.Call $reader.ReadInt8())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT16)):
-                                .Call $writer.WriteInt16(.Call $reader.ReadInt16())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT32)):
-                                .Call $writer.WriteInt32(.Call $reader.ReadInt32())
-                        .Case (.Constant<Bond.BondDataType>(BT_INT64)):
-                                .Call $writer.WriteInt64(.Call $reader.ReadInt64())
-                        .Case (.Constant<Bond.BondDataType>(BT_WSTRING)):
-                                .Call $writer.WriteWString(.Call $reader.ReadWString())
-                        .Default:
-                                .Invoke (.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>)($valueType)
-                        };
-                        .Default(System.Void)
-                    }
-                } .Else {
-                    .Break end { }
-                }
-            }
-            .LabelTarget end:;
-            .Call $writer.WriteContainerEnd()
-        };
-        .Call $reader.ReadContainerEnd()
-    }
-}
-
-.Lambda #Lambda2<System.Action`3[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream],System.Int32]>(
-    Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream] $r,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $w,
-    System.Int32 $i) {
-    .Invoke ((.Constant<ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(ExpressionsTest.Transcoder`2[Bond.Protocols.CompactBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]).transcode)[$i])(
-        $r,
-        $w)
-}
-
-.Lambda #Lambda3<System.Action`1[Bond.BondDataType]>(Bond.BondDataType $t) {
-    .Call Bond.Expressions.ThrowExpression.ThrowInvalidTypeException($t)
-}
--- a/cs/dnc/test/expressions.tests/TranscodeCBSP.expressions
+++ b/cs/dnc/test/expressions.tests/TranscodeCBSP.expressions
--- a/cs/dnc/test/expressions.tests/TranscodeSPCB.expressions
+++ b/cs/dnc/test/expressions.tests/TranscodeSPCB.expressions
@ -1,427 +0,0 @@
-.Lambda #Lambda1<System.Action`2[Bond.Protocols.SimpleBinaryReader`1[Bond.IO.Unsafe.InputStream],Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream]]>(
-    Bond.Protocols.SimpleBinaryReader`1[Bond.IO.Unsafe.InputStream] $reader,
-    Bond.Protocols.CompactBinaryWriter`1[Bond.IO.Unsafe.OutputStream] $writer) {
-    .Block() {
-        .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Example));
-        .Block() {
-            .Call $writer.WriteBaseBegin(.Constant<Bond.Metadata>(Base));
-            .If (
-                .Call $reader.ReadFieldOmitted()
-            ) {
-                .Call $writer.WriteFieldOmitted(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(vvb))
-            } .Else {
-                .Block() {
-                    .Call $writer.WriteFieldBegin(
-                        .Constant<Bond.BondDataType>(BT_LIST),
-                        .Constant<System.UInt16>(0),
-                        .Constant<Bond.Metadata>(vvb));
-                    .Block(System.Int32 $count) {
-                        $count = .Call $reader.ReadContainerBegin();
-                        .Block() {
-                            .Call $writer.WriteContainerBegin(
-                                $count,
-                                .Constant<Bond.BondDataType>(BT_LIST));
-                            .Loop  {
-                                .If ($count-- > 0) {
-                                    .Block() {
-                                        .Default(System.Void);
-                                        .Block(System.Int32 $count) {
-                                            $count = .Call $reader.ReadContainerBegin();
-                                            .Block() {
-                                                .Call $writer.WriteContainerBegin(
-                                                    $count,
-                                                    .Constant<Bond.BondDataType>(BT_UINT64));
-                                                .Loop  {
-                                                    .If ($count-- > 0) {
-                                                        .Block() {
-                                                            .Default(System.Void);
-                                                            .Call $writer.WriteUInt64(.Call $reader.ReadUInt64());
-                                                            .Default(System.Void)
-                                                        }
-                                                    } .Else {
-                                                        .Break end { }
-                                                    }
-                                                }
-                                                .LabelTarget end:;
-                                                .Call $writer.WriteContainerEnd()
-                                            };
-                                            .Call $reader.ReadContainerEnd()
-                                        };
-                                        .Default(System.Void)
-                                    }
-                                } .Else {
-                                    .Break end { }
-                                }
-                            }
-                            .LabelTarget end:;
-                            .Call $writer.WriteContainerEnd()
-                        };
-                        .Call $reader.ReadContainerEnd()
-                    };
-                    .Call $writer.WriteFieldEnd()
-                }
-            };
-            .Call $writer.WriteBaseEnd()
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_BOOL),
-                .Constant<System.UInt16>(0),
-                .Constant<Bond.Metadata>(_bool))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_BOOL),
-                    .Constant<System.UInt16>(0),
-                    .Constant<Bond.Metadata>(_bool));
-                .Call $writer.WriteBool(.Call $reader.ReadBool());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_STRING),
-                .Constant<System.UInt16>(2),
-                .Constant<Bond.Metadata>(_str))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_STRING),
-                    .Constant<System.UInt16>(2),
-                    .Constant<Bond.Metadata>(_str));
-                .Call $writer.WriteString(.Call $reader.ReadString());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_UINT32),
-                .Constant<System.UInt16>(12),
-                .Constant<Bond.Metadata>(_uint32))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_UINT32),
-                    .Constant<System.UInt16>(12),
-                    .Constant<Bond.Metadata>(_uint32));
-                .Call $writer.WriteUInt32(.Call $reader.ReadUInt32());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_INT8),
-                .Constant<System.UInt16>(14),
-                .Constant<Bond.Metadata>(_int8))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_INT8),
-                    .Constant<System.UInt16>(14),
-                    .Constant<Bond.Metadata>(_int8));
-                .Call $writer.WriteInt8(.Call $reader.ReadInt8());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_INT64),
-                .Constant<System.UInt16>(17),
-                .Constant<Bond.Metadata>(_int64))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_INT64),
-                    .Constant<System.UInt16>(17),
-                    .Constant<Bond.Metadata>(_int64));
-                .Call $writer.WriteInt64(.Call $reader.ReadInt64());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_DOUBLE),
-                .Constant<System.UInt16>(18),
-                .Constant<Bond.Metadata>(_double))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                    .Constant<System.UInt16>(18),
-                    .Constant<Bond.Metadata>(_double));
-                .Call $writer.WriteDouble(.Call $reader.ReadDouble());
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_STRUCT),
-                .Constant<System.UInt16>(20),
-                .Constant<Bond.Metadata>(guid))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_STRUCT),
-                    .Constant<System.UInt16>(20),
-                    .Constant<Bond.Metadata>(guid));
-                .Block() {
-                    .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(GUID));
-                    .If (
-                        .Call $reader.ReadFieldOmitted()
-                    ) {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT32),
-                            .Constant<System.UInt16>(0),
-                            .Constant<Bond.Metadata>(Data1))
-                    } .Else {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT32),
-                                .Constant<System.UInt16>(0),
-                                .Constant<Bond.Metadata>(Data1));
-                            .Call $writer.WriteUInt32(.Call $reader.ReadUInt32());
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    };
-                    .If (
-                        .Call $reader.ReadFieldOmitted()
-                    ) {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(1),
-                            .Constant<Bond.Metadata>(Data2))
-                    } .Else {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(1),
-                                .Constant<Bond.Metadata>(Data2));
-                            .Call $writer.WriteUInt16(.Call $reader.ReadUInt16());
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    };
-                    .If (
-                        .Call $reader.ReadFieldOmitted()
-                    ) {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT16),
-                            .Constant<System.UInt16>(2),
-                            .Constant<Bond.Metadata>(Data3))
-                    } .Else {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT16),
-                                .Constant<System.UInt16>(2),
-                                .Constant<Bond.Metadata>(Data3));
-                            .Call $writer.WriteUInt16(.Call $reader.ReadUInt16());
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    };
-                    .If (
-                        .Call $reader.ReadFieldOmitted()
-                    ) {
-                        .Call $writer.WriteFieldOmitted(
-                            .Constant<Bond.BondDataType>(BT_UINT64),
-                            .Constant<System.UInt16>(3),
-                            .Constant<Bond.Metadata>(Data4))
-                    } .Else {
-                        .Block() {
-                            .Call $writer.WriteFieldBegin(
-                                .Constant<Bond.BondDataType>(BT_UINT64),
-                                .Constant<System.UInt16>(3),
-                                .Constant<Bond.Metadata>(Data4));
-                            .Call $writer.WriteUInt64(.Call $reader.ReadUInt64());
-                            .Call $writer.WriteFieldEnd()
-                        }
-                    };
-                    .Call $writer.WriteStructEnd()
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(30),
-                .Constant<Bond.Metadata>(_int32Vector))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(30),
-                    .Constant<Bond.Metadata>(_int32Vector));
-                .Block(System.Int32 $count) {
-                    $count = .Call $reader.ReadContainerBegin();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT32));
-                        .Loop  {
-                            .If ($count-- > 0) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(.Call $reader.ReadInt32());
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    };
-                    .Call $reader.ReadContainerEnd()
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(40),
-                .Constant<Bond.Metadata>(_nestedVector))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(40),
-                    .Constant<Bond.Metadata>(_nestedVector));
-                .Block(System.Int32 $count) {
-                    $count = .Call $reader.ReadContainerBegin();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_STRUCT));
-                        .Loop  {
-                            .If ($count-- > 0) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Block() {
-                                        .Call $writer.WriteStructBegin(.Constant<Bond.Metadata>(Nested));
-                                        .If (
-                                            .Call $reader.ReadFieldOmitted()
-                                        ) {
-                                            .Call $writer.WriteFieldOmitted(
-                                                .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                .Constant<System.UInt16>(0),
-                                                .Constant<Bond.Metadata>(_double))
-                                        } .Else {
-                                            .Block() {
-                                                .Call $writer.WriteFieldBegin(
-                                                    .Constant<Bond.BondDataType>(BT_DOUBLE),
-                                                    .Constant<System.UInt16>(0),
-                                                    .Constant<Bond.Metadata>(_double));
-                                                .Call $writer.WriteDouble(.Call $reader.ReadDouble());
-                                                .Call $writer.WriteFieldEnd()
-                                            }
-                                        };
-                                        .Call $writer.WriteStructEnd()
-                                    };
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    };
-                    .Call $reader.ReadContainerEnd()
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_LIST),
-                .Constant<System.UInt16>(50),
-                .Constant<Bond.Metadata>(b))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_LIST),
-                    .Constant<System.UInt16>(50),
-                    .Constant<Bond.Metadata>(b));
-                .Block(System.Int32 $count) {
-                    $count = .Call $reader.ReadContainerBegin();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT8));
-                        .Call $writer.WriteBytes(.Call $reader.ReadBytes($count));
-                        .Call $writer.WriteContainerEnd()
-                    };
-                    .Call $reader.ReadContainerEnd()
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .If (
-            .Call $reader.ReadFieldOmitted()
-        ) {
-            .Call $writer.WriteFieldOmitted(
-                .Constant<Bond.BondDataType>(BT_MAP),
-                .Constant<System.UInt16>(60),
-                .Constant<Bond.Metadata>(_map))
-        } .Else {
-            .Block() {
-                .Call $writer.WriteFieldBegin(
-                    .Constant<Bond.BondDataType>(BT_MAP),
-                    .Constant<System.UInt16>(60),
-                    .Constant<Bond.Metadata>(_map));
-                .Block(System.Int32 $count) {
-                    $count = .Call $reader.ReadContainerBegin();
-                    .Block() {
-                        .Call $writer.WriteContainerBegin(
-                            $count,
-                            .Constant<Bond.BondDataType>(BT_INT32),
-                            .Constant<Bond.BondDataType>(BT_DOUBLE));
-                        .Loop  {
-                            .If ($count-- > 0) {
-                                .Block() {
-                                    .Default(System.Void);
-                                    .Call $writer.WriteInt32(.Call $reader.ReadInt32());
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Default(System.Void);
-                                    .Call $writer.WriteDouble(.Call $reader.ReadDouble());
-                                    .Default(System.Void)
-                                }
-                            } .Else {
-                                .Break end { }
-                            }
-                        }
-                        .LabelTarget end:;
-                        .Call $writer.WriteContainerEnd()
-                    };
-                    .Call $reader.ReadContainerEnd()
-                };
-                .Call $writer.WriteFieldEnd()
-            }
-        };
-        .Call $writer.WriteStructEnd()
-    }
-}
--- a/cs/dnc/test/expressions.tests/expressions.tests.codegen.proj
+++ b/cs/dnc/test/expressions.tests/expressions.tests.codegen.proj
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BOND_INCLUDE_PATH>..\..\..\..\idl</BOND_INCLUDE_PATH>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\test\expressions\schemas.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/expressions.tests/project.json
+++ b/cs/dnc/test/expressions.tests/project.json
@ -1,55 +0,0 @@
-{
-    "name": "Bond.ExpressionsTest",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../test/expressions/*.cs",
-                "../../../test/expressions/properties/*.cs",
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "portable",
-        "emitEntryPoint": true,
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "io": "1.0.0-*",
-        "json": "1.0.0-*",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "imports": [
-                "netcoreapp1.0",
-                "portable-net45+win8"
-            ],
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0-*",
-                    "type": "platform"
-                }
-            }
-        }
-    }
-}
--- a/cs/dnc/test/grpc.tests/.gitignore
+++ b/cs/dnc/test/grpc.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/grpc.tests/grpc.tests.codegen.proj
+++ b/cs/dnc/test/grpc.tests/grpc.tests.codegen.proj
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BOND_INCLUDE_PATH>..\..\..\..\idl</BOND_INCLUDE_PATH>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-    <BondOptions>--grpc</BondOptions>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\test\grpc\services.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/grpc.tests/project.json
+++ b/cs/dnc/test/grpc.tests/project.json
@ -1,57 +0,0 @@
-{
-    "name": "Bond.Grpc.UnitTest",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../test/grpc/*.cs",
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "core.tests": "1.0.0-*",
-        "grpc": "1.0.0-*",
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "dotnet-test-nunit": "3.4.0-beta-1",
-        "io": "1.0.0-*",
-        "NUnit": "3.4.0",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "imports": [
-                "netcoreapp1.0",
-                "portable-net45+win8"
-            ],
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0-*",
-                    "type": "platform"
-                }
-            }
-        }
-    },
-    "testRunner": "nunit"
-}
--- a/cs/dnc/test/internal.tests/.gitignore
+++ b/cs/dnc/test/internal.tests/.gitignore
@ -1 +0,0 @@
-/gen/
--- a/cs/dnc/test/internal.tests/internal.tests.codegen.proj
+++ b/cs/dnc/test/internal.tests/internal.tests.codegen.proj
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="BondCodegenCs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.props" />
-  <PropertyGroup>
-    <BOND_INCLUDE_PATH>..\..\..\..\idl</BOND_INCLUDE_PATH>
-    <BondOutputDirectory>gen\</BondOutputDirectory>
-  </PropertyGroup>
-  <ItemGroup>
-    <BondCodegen Include="..\..\..\test\internal\schemas.bond" />
-  </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\nuget\Common.targets" />
-</Project>
--- a/cs/dnc/test/internal.tests/project.json
+++ b/cs/dnc/test/internal.tests/project.json
@ -1,55 +0,0 @@
-{
-    "name": "Bond.InternalTest",
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "compile": {
-            "include": [
-                "../../../test/internal/*.cs",
-                "../../../test/internal/properties/*.cs",
-                "gen/*.cs"
-            ]
-        },
-        "debugType": "portable",
-        "nowarn": [
-            "CS1591"
-        ],
-        "warningsAsErrors": true,
-        "xmlDoc": true
-    },
-    "configurations": {
-        "debug": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": false
-            }
-        },
-        "release": {
-            "buildOptions": {
-                "keyFile": "../../../build/internal/bond.snk",
-                "optimize": true
-            }
-        }
-    },
-    "dependencies": {
-        "attributes": "1.0.0-*",
-        "core": "1.0.0-*",
-        "dotnet-test-nunit": "3.4.0-beta-1",
-        "NUnit": "3.4.0",
-        "reflection": "1.0.0-*"
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "imports": [
-                "netcoreapp1.0",
-                "portable-net45+win8"
-            ],
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0-*",
-                    "type": "platform"
-                }
-            }
-        }
-    },
-    "testRunner": "nunit"
-}
--- a/cs/nuget/bond.compiler.csharp.nuspec
+++ b/cs/nuget/bond.compiler.csharp.nuspec
@ -50,12 +50,6 @@
    <file target="build\netstandard1.6" src="cs\build\nuget\Common.targets" />
    <file target="build\netstandard1.6\cps" src="cs\build\nuget\cps\*.xaml" />

-    <file target="build\portable-net45+wp80+win8+wpa81+dnxcore50" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
-    <file target="build\portable-net45+wp80+win8+wpa81+dnxcore50" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
-    <file target="build\portable-net45+wp80+win8+wpa81+dnxcore50" src="cs\build\nuget\Common.props" />
-    <file target="build\portable-net45+wp80+win8+wpa81+dnxcore50" src="cs\build\nuget\Common.targets" />
-    <file target="build\portable-net45+wp80+win8+wpa81+dnxcore50\cps" src="cs\build\nuget\cps\*.xaml" />
-
    <file target="readme.txt" src="cs\nuget\readme.txt" />

    <file target="tools" src="cs\tools\gbc.exe" />
--- a/cs/nuget/bond.core.csharp.nuspec
+++ b/cs/nuget/bond.core.csharp.nuspec
@ -33,9 +33,9 @@
        <file target="lib\net45" src="net45\Bond.Reflection.dll" />
        <file target="lib\net45" src="net45\Bond.Reflection.pdb" />
        <file target="lib\net45" src="net45\Bond.Reflection.xml" />
-        <file target="lib\net45" src="net45-nonportable\Bond.dll" />
-        <file target="lib\net45" src="net45-nonportable\Bond.pdb" />
-        <file target="lib\net45" src="net45-nonportable\Bond.xml" />
+        <file target="lib\net45" src="net45\Bond.dll" />
+        <file target="lib\net45" src="net45\Bond.pdb" />
+        <file target="lib\net45" src="net45\Bond.xml" />

        <file target="lib\netstandard1.0" src="netstandard1.0\Bond.Attributes.dll" />
        <file target="lib\netstandard1.0" src="netstandard1.0\Bond.Attributes.pdb" />
@ -72,15 +72,5 @@
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.dll" />
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.pdb" />
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.xml" />
-
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Attributes.dll" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Attributes.pdb" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Attributes.xml" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Reflection.dll" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Reflection.pdb" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.Reflection.xml" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.dll" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.pdb" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.xml" />
    </files>
 </package>
--- a/cs/nuget/bond.runtime.csharp.nuspec
+++ b/cs/nuget/bond.runtime.csharp.nuspec
@ -28,9 +28,9 @@
        </dependencies>
    </metadata>
    <files>
-        <file target="lib\net45" src="net45-nonportable\Bond.JSON.dll" />
-        <file target="lib\net45" src="net45-nonportable\Bond.JSON.pdb" />
-        <file target="lib\net45" src="net45-nonportable\Bond.JSON.xml" />
+        <file target="lib\net45" src="net45\Bond.JSON.dll" />
+        <file target="lib\net45" src="net45\Bond.JSON.pdb" />
+        <file target="lib\net45" src="net45\Bond.JSON.xml" />

        <file target="lib\netstandard1.0" src="netstandard1.0\Bond.JSON.dll" />
        <file target="lib\netstandard1.0" src="netstandard1.0\Bond.JSON.pdb" />
@ -43,9 +43,5 @@
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.JSON.dll" />
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.JSON.pdb" />
        <file target="lib\netstandard1.6" src="netstandard1.6\Bond.JSON.xml" />
-
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.JSON.dll" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.JSON.pdb" />
-        <file target="lib\portable-net45+wp80+win8+wpa81+dnxcore50" src="net45\Bond.JSON.xml" />
    </files>
 </package>
--- a/cs/src/attributes/Attributes.csproj
+++ b/cs/src/attributes/Attributes.csproj
@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Portable.Internal.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <RootNamespace>Bond</RootNamespace>
    <AssemblyName>Bond.Attributes</AssemblyName>
    <BondRedistributable>true</BondRedistributable>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Attributes.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
 </Project>
--- a/cs/src/core/Bond.csproj
+++ b/cs/src/core/Bond.csproj
@ -1,101 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(BuildNonportable)' == 'true'">
-    <BuildFramework>net45-nonportable</BuildFramework>
-    <DefineConstants>$(DefineConstants);SUPPORTS_XMLRESOLVER</DefineConstants>
-  </PropertyGroup>
-  <Import Condition="'$(BuildNonportable)' == 'true'" Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
-  <Import Condition="'$(BuildNonportable)' != 'true'" Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Portable.Internal.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{43CBBA9B-C4BC-4E64-8733-7B72562D2E91}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Bond</RootNamespace>
-    <AssemblyName>Bond</AssemblyName>
+    <TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <BondRedistributable>true</BondRedistributable>
-    <DependentOutputPath>bin\$(BuildType)\net45</DependentOutputPath>
-    <HasNonportableVersion>true</HasNonportableVersion>
  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_XMLRESOLVER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BOND_INCLUDE_PATH Condition="'$(BOND_INCLUDE_PATH)' == ''">$(MSBuildThisFileDirectory)..\..\..\idl</BOND_INCLUDE_PATH>
+  </PropertyGroup>
+
  <ItemGroup>
    <BondCodegen Include="$(BOND_INCLUDE_PATH)\bond\core\bond.bond" />
    <BondCodegen Include="$(BOND_INCLUDE_PATH)\bond\core\bond_const.bond" />
-    <Compile Include="Audit.cs" />
-    <Compile Include="Blob.cs" />
-    <Compile Include="Bond.cs" />
-    <Compile Include="Bonded.cs" />
-    <Compile Include="Clone.cs" />
-    <Compile Include="Comparer.cs" />
-    <Compile Include="Deserializer.cs" />
-    <Compile Include="expressions\ControlExpression.cs" />
-    <Compile Include="expressions\DataExpression.cs" />
-    <Compile Include="expressions\DeserializerTransform.cs" />
-    <Compile Include="expressions\IParser.cs" />
-    <Compile Include="expressions\ISerializerGenerator.cs" />
-    <Compile Include="expressions\ObjectParser.cs" />
-    <Compile Include="expressions\ParserFactory.cs" />
-    <Compile Include="expressions\ProtocolWriter.cs" />
-    <Compile Include="expressions\PrunedExpression.cs" />
-    <Compile Include="expressions\pull\FlatteningParser.cs" />
-    <Compile Include="expressions\pull\IStateMachine.cs" />
-    <Compile Include="expressions\pull\PullParser.cs" />
-    <Compile Include="expressions\pull\StateMachine.cs" />
-    <Compile Include="expressions\RequiredFields.cs" />
-    <Compile Include="expressions\SerializerGeneratorFactory.cs" />
-    <Compile Include="expressions\SerializerTransform.cs" />
-    <Compile Include="expressions\StringExpression.cs" />
-    <Compile Include="expressions\TaggedParser.cs" />
-    <Compile Include="expressions\TaggedReader.cs" />
-    <Compile Include="expressions\ThrowExpression.cs" />
-    <Compile Include="expressions\Transform.cs" />
-    <Compile Include="expressions\TypeAlias.cs" />
-    <Compile Include="expressions\UntaggedParser.cs" />
-    <Compile Include="expressions\UntaggedReader.cs" />
-    <Compile Include="expressions\xml\SimpleXmlParser.cs" />
-    <Compile Include="expressions\xml\XmlParser.cs" />
-    <Compile Include="expressions\xml\XmlReader.cs" />
-    <Compile Include="Field.cs" />
-    <Compile Include="GenericFactory.cs" />
-    <Compile Include="IFactory.cs" />
-    <Compile Include="io\ICloneable.cs" />
-    <Compile Include="io\IInputStream.cs" />
-    <Compile Include="io\IntegerHelper.cs" />
-    <Compile Include="io\IOutputStream.cs" />
-    <Compile Include="io\safe\InputBuffer.cs" />
-    <Compile Include="io\safe\OutputBuffer.cs" />
-    <Compile Include="ISchemaField.cs" />
-    <Compile Include="Marshaler.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="Property.cs" />
-    <Compile Include="protocols\CompactBinary.cs" />
-    <Compile Include="protocols\CompactBinaryCounter.cs" />
-    <Compile Include="protocols\Exceptions.cs" />
-    <Compile Include="protocols\FastBinary.cs" />
-    <Compile Include="protocols\IProtocolWriter.cs" />
-    <Compile Include="protocols\ITaggedReader.cs" />
-    <Compile Include="protocols\IUntaggedReader.cs" />
-    <Compile Include="protocols\IXmlReader.cs" />
-    <Compile Include="protocols\SimpleBinary.cs" />
-    <Compile Include="protocols\SimpleXmlReader.cs" />
-    <Compile Include="protocols\SimpleXmlWriter.cs" />
-    <Compile Include="protocols\XmlMetadata.cs" />
-    <Compile Include="Reflection.cs" />
-    <Compile Include="RuntimeSchema.cs" />
-    <Compile Include="Schema.cs" />
-    <Compile Include="Serializer.cs" />
-    <Compile Include="Transcoder.cs" />
-    <!-- Resharper Workaround -->
-    <Compile Include="$(IntermediateOutputPath)\bond_types.cs" Condition="False" />
-    <Compile Include="$(IntermediateOutputPath)\bond_const_types.cs" Condition="False" />
-    <!-- End Resharper Workaround -->
+    <Compile Condition="False" Include="$(IntermediateOutputPath)\bond_types.cs" />
+    <Compile Condition="False" Include="$(IntermediateOutputPath)\bond_const_types.cs" />
  </ItemGroup>
+
  <ItemGroup>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\attributes\$(DependentOutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Reflection">
-      <HintPath>..\reflection\$(DependentOutputPath)\Bond.Reflection.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\reflection\reflection.csproj" />
  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
-</Project>
+</Project>
--- a/cs/src/core/properties/AssemblyInfo.cs
+++ b/cs/src/core/properties/AssemblyInfo.cs
@ -16,3 +16,4 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Bond.ExpressionsTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
 [assembly: InternalsVisibleTo("Bond.InternalTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
 [assembly: InternalsVisibleTo("Bond.UnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
+[assembly: InternalsVisibleTo("Bond.UnitTestCoreNS10, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
--- a/cs/src/grpc/grpc.csproj
+++ b/cs/src/grpc/grpc.csproj
@ -1,38 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <RootNamespace>Bond.Grpc</RootNamespace>
    <AssemblyName>Bond.Grpc</AssemblyName>
    <BondRedistributable>true</BondRedistributable>
  </PropertyGroup>
+
  <ItemGroup>
-    <Compile Include="Marshaller.cs" />
-    <Compile Include="Message.cs" />
-    <Compile Include="NothingCalls.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
+    <PackageReference Include="System.Interactive.Async" Version="3.1.1" />
  </ItemGroup>
+
  <ItemGroup>
-    <Reference Include="Bond">
-      <HintPath>..\core\$(OutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\attributes\$(OutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.IO">
-      <HintPath>..\io\$(OutputPath)\Bond.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\core\Bond.csproj" />
+    <ProjectReference Include="..\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\io\IO.csproj" />
  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
-  <Import Project="..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/cs/src/grpc/packages.config
+++ b/cs/src/grpc/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/cs/src/io/IO.csproj
+++ b/cs/src/io/IO.csproj
@ -1,40 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{2E6E238C-9017-445C-9611-66DA780609BE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net45;netstandard1.3;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <RootNamespace>Bond.IO</RootNamespace>
    <AssemblyName>Bond.IO</AssemblyName>
    <BondRedistributable>true</BondRedistributable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
+
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="unsafe\InputBuffer.cs" />
-    <Compile Include="unsafe\InputPointer.cs" />
-    <Compile Include="unsafe\InputStream.cs" />
-    <Compile Include="unsafe\IntegerHelper.cs" />
-    <Compile Include="unsafe\OutputBuffer.cs" />
-    <Compile Include="unsafe\OutputPointer.cs" />
-    <Compile Include="unsafe\OutputStream.cs" />
-    <Compile Include="unsafe\StreamCloning.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Bond">
-      <HintPath>..\core\$(OutputPath)\Bond.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\core\Bond.csproj" />
  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
 </Project>
--- a/cs/src/json/JSON.csproj
+++ b/cs/src/json/JSON.csproj
@ -1,48 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(BuildNonportable)' == 'true'">
-    <BuildFramework>net45-nonportable</BuildFramework>
-    <DefineConstants>$(DefineConstants);SUPPORTS_BIGINTEGER</DefineConstants>
-  </PropertyGroup>
-  <Import Condition="'$(BuildNonportable)' == 'true'" Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
-  <Import Condition="'$(BuildNonportable)' != 'true'" Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Portable.Internal.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{C001C79F-D289-4CF3-BB59-5F5A72F70D0E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <RootNamespace>Bond</RootNamespace>
    <AssemblyName>Bond.JSON</AssemblyName>
    <BondRedistributable>true</BondRedistributable>
-    <DependentOutputPath>bin\$(BuildType)\net45</DependentOutputPath>
-    <HasNonportableVersion>true</HasNonportableVersion>
  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'netstandard1.6'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_BIGINTEGER</DefineConstants>
+  </PropertyGroup>
+
  <ItemGroup>
-    <Compile Include="expressions\json\JsonParser.cs" />
-    <Compile Include="expressions\json\SimpleJsonParser.cs" />
-    <Compile Include="expressions\json\JsonReader.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="protocols\IJsonReader.cs" />
-    <Compile Include="protocols\SimpleJsonReader.cs" />
-    <Compile Include="protocols\SimpleJsonWriter.cs" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
  </ItemGroup>
+
  <ItemGroup>
-    <Reference Include="System.Numerics" Condition="'$(BuildFramework)' == 'net45-nonportable'" />
-    <Reference Include="Bond">
-      <HintPath>..\core\$(DependentOutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\attributes\$(DependentOutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json" Condition="'$(BuildFramework)' == 'net45'">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json" Condition="'$(BuildFramework)' == 'net45-nonportable'">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\core\Bond.csproj" />
+    <ProjectReference Include="..\attributes\Attributes.csproj" />
  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
 </Project>
--- a/cs/src/json/packages.config
+++ b/cs/src/json/packages.config
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable-net45+wp80+win8+wpa81" />
-</packages>
--- a/cs/src/reflection/properties/AssemblyInfo.cs
+++ b/cs/src/reflection/properties/AssemblyInfo.cs
@ -18,3 +18,4 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Bond.JSON, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
 [assembly: InternalsVisibleTo("Bond.NuGetTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
 [assembly: InternalsVisibleTo("Bond.UnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
+[assembly: InternalsVisibleTo("Bond.UnitTestCoreNS10, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")]
--- a/cs/src/reflection/reflection.csproj
+++ b/cs/src/reflection/reflection.csproj
@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Portable.Internal.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+
  <PropertyGroup>
    <ProjectGuid>{40452223-3a34-4841-9a69-e0b6640b4108}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
    <RootNamespace>Bond.Reflection</RootNamespace>
    <AssemblyName>Bond.Reflection</AssemblyName>
    <BondRedistributable>true</BondRedistributable>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="Reflection.cs" />
-  </ItemGroup>
+
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
 </Project>
--- a/cs/test/compat/grpc/client/GrpcCompatClient.csproj
+++ b/cs/test/compat/grpc/client/GrpcCompatClient.csproj
@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{D82898E8-4695-4233-98C6-1B3624241A2D}</ProjectGuid>
@ -8,40 +6,16 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>GrpcCompatClient</RootNamespace>
    <AssemblyName>GrpcCompatClient</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Bond">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj">
-      <Project>{af03bae6-2470-4e1b-a683-3ebdcdc595fa}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\shared\GrpcCompatShared.csproj">
-      <Project>{8FC5BF4E-6932-48FC-AA57-3D5F43130699}</Project>
-      <Name>GrpcCompatShared</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\src\core\Bond.csproj" />
+    <ProjectReference Include="..\..\..\..\src\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj" />
+    <ProjectReference Include="..\shared\GrpcCompatShared.csproj" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.targets" />
-  <Import Project="..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/cs/test/compat/grpc/client/packages.config
+++ b/cs/test/compat/grpc/client/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/cs/test/compat/grpc/server/GrpcCompatServer.csproj
+++ b/cs/test/compat/grpc/server/GrpcCompatServer.csproj
@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{A6D526FD-22B0-4151-9B3E-D20C3C05D81D}</ProjectGuid>
@ -8,40 +6,16 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>GrpcCompatServer</RootNamespace>
    <AssemblyName>GrpcCompatServer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Bond">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj">
-      <Project>{af03bae6-2470-4e1b-a683-3ebdcdc595fa}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\shared\GrpcCompatShared.csproj">
-      <Project>{8FC5BF4E-6932-48FC-AA57-3D5F43130699}</Project>
-      <Name>GrpcCompatShared</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\src\core\Bond.csproj" />
+    <ProjectReference Include="..\..\..\..\src\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj" />
+    <ProjectReference Include="..\shared\GrpcCompatShared.csproj" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.targets" />
-  <Import Project="..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/cs/test/compat/grpc/server/packages.config
+++ b/cs/test/compat/grpc/server/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/cs/test/compat/grpc/shared/GrpcCompatShared.csproj
+++ b/cs/test/compat/grpc/shared/GrpcCompatShared.csproj
@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{8FC5BF4E-6932-48FC-AA57-3D5F43130699}</ProjectGuid>
@ -8,19 +6,12 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>GrpcCompatShared</RootNamespace>
    <AssemblyName>GrpcCompatShared</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
    <BondCodegen Include="..\..\..\..\..\test\compat\grpc\pingpong.bond">
      <Options>--grpc</Options>
    </BondCodegen>
@ -30,22 +21,11 @@
    <!-- End Resharper Workaround -->
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="Bond">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\..\..\..\$(OutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\..\..\..\src\core\Bond.csproj" />
+    <ProjectReference Include="..\..\..\..\src\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\grpc\grpc.csproj">
-      <Project>{af03bae6-2470-4e1b-a683-3ebdcdc595fa}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\build\internal\Common.Internal.targets" />
-  <Import Project="..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/cs/test/compat/grpc/shared/packages.config
+++ b/cs/test/compat/grpc/shared/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/cs/test/core/Core.csproj
+++ b/cs/test/core/Core.csproj
@ -1,23 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(BuildNonportable)' == 'true'">
-    <BuildFramework>net45-nonportable</BuildFramework>
-    <DefineConstants>$(DefineConstants);SUPPORTS_BIGINTEGER;SUPPORTS_XMLRESOLVER</DefineConstants>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{FF056B62-225A-47BC-B177-550FADDA4B41}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
+    <Configurations>Debug;Release;Fields</Configurations>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>UnitTest</RootNamespace>
    <AssemblyName>Bond.UnitTest</AssemblyName>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <IsCodedUITest>False</IsCodedUITest>
    <TestProjectType>UnitTest</TestProjectType>
-    <OrigOutputPath>$(OutputPath)</OrigOutputPath>
-    <DependentOutputPath>bin\$(BuildType)\net45</DependentOutputPath>
-    <HasNonportableVersion>true</HasNonportableVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);SUPPORTS_BIGINTEGER;SUPPORTS_XMLRESOLVER</DefineConstants>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <IntermediateOutputPath>$(IntermediateOutputPath)\Properties\</IntermediateOutputPath>
@ -32,50 +27,20 @@
    <BondImportDirectory Include="import dir with spaces\" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AttributesTests.cs" />
-    <Compile Include="BondClass.cs" />
-    <Compile Include="BondedTests.cs" />
-    <Compile Include="CloningTests.cs" />
-    <Compile Include="ConvertTests.cs" />
-    <Compile Include="CustomBondedTests.cs" />
-    <Compile Include="DeserializerControlsTests.cs" />
-    <Compile Include="EnumString.cs" />
-    <Compile Include="Equal.cs" />
-    <Compile Include="GenericsTests.cs" />
-    <Compile Include="GuidConversionTests.cs" />
-    <Compile Include="InterfaceTests.cs" />
-    <Compile Include="JsonParsingTests.cs" />
-    <Compile Include="JsonSerializationTests.cs" />
-    <Compile Include="MetaInitializationTests.cs" />
-    <Compile Include="Partial.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="ProtocolTests.cs" />
-    <Compile Include="Random.cs" />
-    <Compile Include="SerializationTests.cs" />
-    <Compile Include="SerializerGeneratorFactoryTests.cs" />
-    <Compile Include="StreamTests.cs" />
-    <Compile Include="Structs.cs" />
-    <Compile Include="TypeAliasTests.cs" />
-    <Compile Include="Util.cs" />
-    <Compile Include="XmlParsingTests.cs" />
-    <Compile Include="XmlSerializationTests.cs" />
-    <BondCodegen Include="Aliases.bond">
+    <BondCodegen Update="Aliases.bond">
      <Options>$(BondOptions) --using="Lazy=Lazy&lt;{0}&gt;" --using="OrderedSet=SortedSet&lt;{0}&gt;" --using="Decimal=decimal" --using="EnumString=Alias.EnumString&lt;{0}&gt;" --using="Array={0}[]" --using=ArrayBlob=byte[] --using="CustomList=UnitTest.Aliases.SomeCustomList&lt;{0}&gt;"</Options>
    </BondCodegen>
-    <BondCodegen Include="NamespaceConflict.bond" />
-    <BondCodegen Include="NamespaceConflictBond.bond" />
-    <BondCodegen Include="ReadOnly.bond">
+    <BondCodegen Update="ReadOnly.bond">
      <Options Condition=" '$(Configuration)' != 'Fields' ">$(BondOptions) --readonly-properties</Options>
      <Options Condition=" '$(Configuration)' == 'Fields' ">--readonly-properties --collection-interfaces</Options>
    </BondCodegen>
-    <BondCodegen Include="Containers.bond">
+    <BondCodegen Update="Containers.bond">
      <Options Condition=" '$(Configuration)' != 'Fields' ">$(BondOptions) --collection-interfaces</Options>
      <Options Condition=" '$(Configuration)' == 'Fields' ">--fields</Options>
    </BondCodegen>
-    <BondCodegen Include="UnitTest.bond">
+    <BondCodegen Update="UnitTest.bond">
      <Options>$(BondOptions) --using="DateTime=System.DateTime"</Options>
    </BondCodegen>
-    <BondCodegen Include="import dir with spaces\Bond File With Spaces.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\Aliases_types.cs" Condition="False" />
    <Compile Include="$(IntermediateOutputPath)\Bond File With Spaces_types.cs" Condition="False" />
@ -87,40 +52,16 @@
    <!-- End Resharper Workaround -->
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="NUnit.VisualStudio.TestAdapter" Condition="'$(OS)' != 'Unix'">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json" Condition="'$(BuildFramework)' == 'net45'">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json" Condition="'$(BuildFramework)' == 'net45-nonportable'">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="NUnit" Version="3.10.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="Bond.Attributes">
-      <HintPath>..\..\src\attributes\$(DependentOutputPath)\Bond.Attributes.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond">
-      <!-- Intentionally not DependentOutputPath to match BuildFramework-->
-      <HintPath>..\..\src\core\$(OrigOutputPath)\Bond.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.Reflection">
-      <HintPath>..\..\src\reflection\$(DependentOutputPath)\Bond.Reflection.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.IO">
-      <HintPath>..\..\src\io\$(DependentOutputPath)\Bond.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="Bond.JSON">
-      <!-- Intentionally not DependentOutputPath to match BuildFramework-->
-      <HintPath>..\..\src\json\$(OrigOutputPath)\Bond.JSON.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\src\attributes\Attributes.csproj" />
+    <ProjectReference Include="..\..\src\core\Bond.csproj" />
+    <ProjectReference Include="..\..\src\reflection\reflection.csproj" />
+    <ProjectReference Include="..\..\src\io\IO.csproj" />
+    <ProjectReference Include="..\..\src\json\JSON.csproj" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
-</Project>
+</Project>
--- a/cs/test/core/packages.config
+++ b/cs/test/core/packages.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable-net45+wp80+win8+wpa81" />
-  <package id="NUnit" version="2.6.4" targetFramework="portable-net45+wp80+win" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
-</packages>
--- a/cs/test/coreNS10/CoreNS10.csproj
+++ b/cs/test/coreNS10/CoreNS10.csproj
@ -0,0 +1,72 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
+  <PropertyGroup>
+    <TargetFrameworks>net45</TargetFrameworks>
+    <Configurations>Debug;Release;Fields</Configurations>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UnitTest</RootNamespace>
+    <AssemblyName>Bond.UnitTestCoreNS10</AssemblyName>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <!-- This project is used to test the netstandard1.0 implementation of Bond -->
+    <BondTargetFramework>netstandard1.0</BondTargetFramework>
+    <BondIOTargetFramework>netstandard1.3</BondIOTargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <IntermediateOutputPath>$(IntermediateOutputPath)\Properties\</IntermediateOutputPath>
+    <OutputPath>$(OutputPath)\Properties\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Fields' ">
+    <IntermediateOutputPath>$(IntermediateOutputPath)\Fields\</IntermediateOutputPath>
+    <OutputPath>$(OutputPath)\Fields\</OutputPath>
+    <BondOptions>--fields --collection-interfaces</BondOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <BondImportDirectory Include="..\core\import dir with spaces\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\core\*.cs" />
+    <BondCodegen Include="..\core\Aliases.bond">
+      <Options>$(BondOptions) --using="Lazy=Lazy&lt;{0}&gt;" --using="OrderedSet=SortedSet&lt;{0}&gt;" --using="Decimal=decimal" --using="EnumString=Alias.EnumString&lt;{0}&gt;" --using="Array={0}[]" --using=ArrayBlob=byte[] --using="CustomList=UnitTest.Aliases.SomeCustomList&lt;{0}&gt;"</Options>
+    </BondCodegen>
+    <BondCodegen Include="..\core\NamespaceConflict.bond" />
+    <BondCodegen Include="..\core\NamespaceConflictBond.bond" />
+    <BondCodegen Include="..\core\ReadOnly.bond">
+      <Options Condition=" '$(Configuration)' != 'Fields' ">$(BondOptions) --readonly-properties</Options>
+      <Options Condition=" '$(Configuration)' == 'Fields' ">--readonly-properties --collection-interfaces</Options>
+    </BondCodegen>
+    <BondCodegen Include="..\core\Containers.bond">
+      <Options Condition=" '$(Configuration)' != 'Fields' ">$(BondOptions) --collection-interfaces</Options>
+      <Options Condition=" '$(Configuration)' == 'Fields' ">--fields</Options>
+    </BondCodegen>
+    <BondCodegen Include="..\core\UnitTest.bond">
+      <Options>$(BondOptions) --using="DateTime=System.DateTime"</Options>
+    </BondCodegen>
+    <BondCodegen Include="..\core\import dir with spaces\Bond File With Spaces.bond" />
+    <!-- Resharper Workaround -->
+    <Compile Include="$(IntermediateOutputPath)\Aliases_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\Bond File With Spaces_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\Containers_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\NamespaceConflict_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\NamespaceConflictBond_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\ReadOnly_types.cs" Condition="False" />
+    <Compile Include="$(IntermediateOutputPath)\UnitTest_types.cs" Condition="False" />
+    <!-- End Resharper Workaround -->
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="NUnit" Version="3.10.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\attributes\Attributes.csproj" AdditionalProperties="TargetFramework=$(BondTargetFramework)" />
+    <ProjectReference Include="..\..\src\core\Bond.csproj" AdditionalProperties="TargetFramework=$(BondTargetFramework)" />
+    <ProjectReference Include="..\..\src\reflection\reflection.csproj" AdditionalProperties="TargetFramework=$(BondTargetFramework)" />
+    <ProjectReference Include="..\..\src\io\IO.csproj" AdditionalProperties="TargetFramework=$(BondIOTargetFramework)" />
+    <ProjectReference Include="..\..\src\json\JSON.csproj" AdditionalProperties="TargetFramework=$(BondTargetFramework)" />
+  </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
+</Project>
+
--- a/cs/test/coreNS10/Properties/AssemblyInfo.cs
+++ b/cs/test/coreNS10/Properties/AssemblyInfo.cs
@ -0,0 +1,23 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Bond.UnitTestCoreNS10")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Bond")]
+[assembly: AssemblyCopyright("Copyright (C) Microsoft. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8bed1071-4eba-429a-9628-e993ab5d8b3e")]
--- a/cs/test/grpc/grpc.csproj
+++ b/cs/test/grpc/grpc.csproj
@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{D5F087E7-1EE9-4AEB-83AF-5F234C69B867}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
+    <Configurations>Debug;Release;Fields</Configurations>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>UnitTest</RootNamespace>
    <AssemblyName>Bond.Grpc.UnitTest</AssemblyName>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <IsCodedUITest>False</IsCodedUITest>
    <TestProjectType>UnitTest</TestProjectType>
-    <DependentOutputPath>$(OutputPath)</DependentOutputPath>
+    <DependentOutputPath>bin\$(BuildType)\$(TargetFramework)</DependentOutputPath>
    <BondOptions>--grpc</BondOptions>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -24,29 +23,12 @@
    <BondOptions>--collection-interfaces --fields --grpc</BondOptions>
  </PropertyGroup>
  <ItemGroup>
-    <Compile Include="AttributesTests.cs" />
-    <Compile Include="MarshallerTests.cs" />
-    <Compile Include="MessageTests.cs" />
-    <Compile Include="NothingCallsTests.cs" />
-    <Compile Include="Schemas.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BondCodegen Include="services.bond" />
    <Compile Include="$(IntermediateOutputPath)services_grpc.cs" Condition="false" />
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter" Condition="'$(OS)' != 'Unix'">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="NUnit" Version="3.10.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Bond.Attributes">
@ -66,15 +48,8 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\grpc\grpc.csproj">
-      <Project>{af03bae6-2470-4e1b-a683-3ebdcdc595fa}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\core\Core.csproj">
-      <Project>{ff056b62-225a-47bc-b177-550fadda4b41}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
+      <ProjectReference Include="..\..\src\grpc\grpc.csproj" />
+      <ProjectReference Include="..\core\Core.csproj" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
-  <Import Project="..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/cs/test/internal/Internal.csproj
+++ b/cs/test/internal/Internal.csproj
@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.props" />
  <PropertyGroup>
    <ProjectGuid>{2994D2BC-2C4A-479E-AD23-051721470095}</ProjectGuid>
@ -8,17 +6,11 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>InternalTest</RootNamespace>
    <AssemblyName>Bond.InternalTest</AssemblyName>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <IsCodedUITest>False</IsCodedUITest>
    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Compile Include="ReflectionDefaultValueTests.cs" />
-    <Compile Include="ReflectionTests.cs" />
-    <Compile Include="properties\AssemblyInfo.cs" />
-    <Compile Include="SchemaTests.cs" />
-    <Compile Include="RequiredFieldsTest.cs" />
-    <BondCodegen Include="schemas.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\schemas_types.cs" Condition="False" />
    <!-- End Resharper Workaround -->
@ -33,15 +25,8 @@
    <Reference Include="Bond">
      <HintPath>..\..\src\core\$(OutputPath)\Bond.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter" Condition="'$(OS)' != 'Unix'">
-      <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="NUnit" Version="3.10.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
  </ItemGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\internal\Common.Internal.targets" />
 </Project>
--- a/cs/test/internal/packages.config
+++ b/cs/test/internal/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="portable-net45+wp80+win" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
-</packages>
--- a/examples/cs/core/simple_json/simple_json.csproj
+++ b/examples/cs/core/simple_json/simple_json.csproj
@ -1,45 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{45E4032C-78E1-41dd-8E51-1CC5AD2AEE02}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>simple_json</RootNamespace>
    <AssemblyName>simple_json</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>   
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BondCodegen Include="schema.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\schema_types.cs" Condition="False" />
    <!-- End Resharper Workaround -->
@ -47,20 +15,17 @@
  <ItemGroup>
    <Reference Include="Attributes">
      <HintPath>$(BOND_BINARY_PATH)\net45\Bond.Attributes.dll</HintPath>
-    </Reference>    
+    </Reference>
    <Reference Include="Bond">
      <HintPath>$(BOND_BINARY_PATH)\net45\Bond.dll</HintPath>
-    </Reference>    
+    </Reference>
    <Reference Include="Bond.IO">
      <HintPath>$(BOND_BINARY_PATH)\net45\Bond.IO.dll</HintPath>
-    </Reference>    
+    </Reference>
    <Reference Include="Bond.JSON">
      <HintPath>$(BOND_BINARY_PATH)\net45\Bond.JSON.dll</HintPath>
-    </Reference>    
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\cs\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
 </Project>
--- a/examples/cs/grpc/generics/grpc_generics.csproj
+++ b/examples/cs/grpc/generics/grpc_generics.csproj
@ -1,49 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{6887352A-4071-46D6-B095-2514985A3AB6}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>Examples.GrpcGenerics</RootNamespace>
    <AssemblyName>grpc-generics</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
    <BondOptions>--grpc</BondOptions>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="GrpcGenerics.cs" />
-    <Compile Include="InverterServices.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BondCodegen Include="inverter.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\inverter_types.cs" Condition="False" />
    <Compile Include="$(IntermediateOutputPath)\inverter_grpc.cs" Condition="False" />
@ -61,15 +29,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/examples/cs/grpc/generics/packages.config
+++ b/examples/cs/grpc/generics/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/examples/cs/grpc/pingpong/grpc_pingpong.csproj
+++ b/examples/cs/grpc/pingpong/grpc_pingpong.csproj
@ -1,47 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{618420F1-6465-4DF4-BD1B-747765F481FF}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>pingpong</RootNamespace>
    <AssemblyName>grpc-pingpong</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="DoublePingService.cs" />
-    <Compile Include="GrpcPingPong.cs" />
-    <Compile Include="PingPongService.cs" />
-    <BondCodegen Include="pingpong.bond">
+    <BondCodegen Update="pingpong.bond">
      <Options>--grpc</Options>
    </BondCodegen>
    <!-- Resharper Workaround -->
@ -61,15 +31,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
 </Project>
--- a/examples/cs/grpc/pingpong/packages.config
+++ b/examples/cs/grpc/pingpong/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/examples/cs/grpc/scalar/grpc_scalar.csproj
+++ b/examples/cs/grpc/scalar/grpc_scalar.csproj
@ -1,53 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{51F4135B-2CEF-436F-91CE-A6548B37E459}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>scalar</RootNamespace>
    <AssemblyName>grpc-scalar</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
    <BondOptions>--grpc</BondOptions>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GrpcScalar.cs" />
-    <Compile Include="ScalarService.cs" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
    <!-- This import is not needed when consuming Bond via NuGet packages.
         Due to the different layout of the Bond repository, we manually
         specify it here. -->
    <BondImportDirectory Include="..\..\..\..\idl" />
-    <BondCodegen Include="scalar.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\scalar_types.cs" Condition="False" />
    <Compile Include="$(IntermediateOutputPath)\scalar_grpc.cs" Condition="False" />
@ -65,15 +33,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
 </Project>
--- a/examples/cs/grpc/scalar/packages.config
+++ b/examples/cs/grpc/scalar/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/examples/cs/grpc/shared-types-assembly/client/grpc_sta-client.csproj
+++ b/examples/cs/grpc/shared-types-assembly/client/grpc_sta-client.csproj
@ -1,44 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{9DCEAD87-C61F-40D5-989E-0E44F56E01BE}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>Examples.SharedTypes</RootNamespace>
    <AssemblyName>grpc_sta-client</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StaClient.cs" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
    <!-- This import is not needed when consuming Bond via NuGet packages.
@ -64,19 +34,8 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\..\cs\src\grpc\grpc.csproj" />
+    <ProjectReference Include="..\types\grpc_sta-types.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\types\grpc_sta-types.csproj">
-      <Project>{723baa6b-b309-48cf-b2a9-ecddc91909d1}</Project>
-      <Name>grpc_sta-types</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
 </Project>
--- a/examples/cs/grpc/shared-types-assembly/server/grpc_sta-server.csproj
+++ b/examples/cs/grpc/shared-types-assembly/server/grpc_sta-server.csproj
@ -1,48 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{A390B660-5F81-4CD3-B5EF-EB7C1C6B6AFE}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>Examples.SharedTypes</RootNamespace>
    <AssemblyName>grpc_sta-service</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
    <!-- We could also use BondCodegen.Options item metadata to configure
         this per-file. -->
    <BondOptions>--grpc --structs=false</BondOptions>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StaServer.cs" />
-    <Compile Include="CalcService.cs" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
    <BondCodegen Include="..\sta.bond" />
@ -59,19 +28,8 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\..\cs\src\grpc\grpc.csproj" />
+    <ProjectReference Include="..\types\grpc_sta-types.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\types\grpc_sta-types.csproj">
-      <Project>{723BAA6B-B309-48CF-B2A9-ECDDC91909D1}</Project>
-      <Name>grpc_sta-types</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
 </Project>
--- a/examples/cs/grpc/streaming/grpc_streaming.csproj
+++ b/examples/cs/grpc/streaming/grpc_streaming.csproj
@ -1,53 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\cs\build\nuget\Bond.CSharp.props" />
  <PropertyGroup>
    <ProjectGuid>{5C6BAEFE-9F72-451E-85CC-F4521E92AEB9}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>Examples.GrpcStream</RootNamespace>
    <AssemblyName>grpc-streaming</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>net45</TargetFrameworks>
    <BondOptions>--grpc</BondOptions>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Grpc.Core">
-      <HintPath>..\..\..\..\cs\packages\Grpc.Core.1.10.0\lib\net45\Grpc.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Interactive.Async">
-      <HintPath>..\..\..\..\cs\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GrpcStreaming.cs" />
-    <Compile Include="StreamingService.cs" />
+    <PackageReference Include="Grpc.Core" Version="1.10.0" />
  </ItemGroup>
  <ItemGroup>
    <!-- This import is not needed when consuming Bond via NuGet packages.
         Due to the different layout of the Bond repository, we manually
         specify it here. -->
    <BondImportDirectory Include="..\..\..\..\idl" />
-    <BondCodegen Include="streaming.bond" />
    <!-- Resharper Workaround -->
    <Compile Include="$(IntermediateOutputPath)\streaming_types.cs" Condition="False" />
    <Compile Include="$(IntermediateOutputPath)\streaming_grpc.cs" Condition="False" />
@ -65,15 +33,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cs\src\grpc\grpc.csproj">
-      <Project>{AF03BAE6-2470-4E1B-A683-3EBDCDC595FA}</Project>
-      <Name>grpc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(BOND_PATH)\build\nuget\Bond.CSharp.targets" />
-  <Import Project="..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\..\..\cs\packages\Grpc.Core.1.10.0\build\net45\Grpc.Core.targets')" />
-</Project>
+</Project>
--- a/examples/cs/grpc/streaming/packages.config
+++ b/examples/cs/grpc/streaming/packages.config
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Core" version="1.10.0" targetFramework="net45" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" />
-</packages>
--- a/tools/ci-scripts/linux/build_cs.zsh
+++ b/tools/ci-scripts/linux/build_cs.zsh
@ -2,6 +2,7 @@

 set -eux

+nuget update -self
 nuget restore $BOND_ROOT/cs/cs.sln

 local BOND_CMAKE_FLAGS="$BOND_CMAKE_FLAGS -DBOND_SKIP_GBC_TESTS=TRUE -DBOND_SKIP_CORE_TESTS=TRUE -DBOND_ENABLE_GRPC=FALSE"
@ -17,7 +18,9 @@ make install
 msbuild /p:Configuration=Debug /m $BOND_ROOT/cs/cs.sln
 msbuild /p:Configuration=Fields /m $BOND_ROOT/cs/cs.sln

-mono /root/NUnit.Runners.2.6.4/tools/nunit-console.exe -framework=mono-4.5 -labels \
-    $BOND_ROOT/cs/test/core/bin/debug/net45/Properties/Bond.UnitTest.dll \
-    $BOND_ROOT/cs/test/core/bin/debug/net45/Fields/Bond.UnitTest.dll \
+mono /root/NUnit.ConsoleRunner/tools/nunit3-console.exe -framework=mono -labels=All \
+    $BOND_ROOT/cs/test/core/bin/debug/Properties/net45/Bond.UnitTest.dll \
+    $BOND_ROOT/cs/test/core/bin/debug/Fields/net45/Bond.UnitTest.dll \
+    $BOND_ROOT/cs/test/coreNS10/bin/debug/Properties/net45/Bond.UnitTestCoreNS10.dll \
+    $BOND_ROOT/cs/test/coreNS10/bin/debug/Fields/net45/Bond.UnitTestCoreNS10.dll \
    $BOND_ROOT/cs/test/internal/bin/debug/net45/Bond.InternalTest.dll
--- a/tools/ci-scripts/linux/image-builder/Dockerfile
+++ b/tools/ci-scripts/linux/image-builder/Dockerfile
@ -40,7 +40,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
    mono-devel \
    nuget \
    referenceassemblies-pcl
-RUN nuget install NUnit.Runners -OutputDirectory /root -version 2.6.4
+RUN nuget install NUnit.ConsoleRunner -OutputDirectory /root -Version 3.8.0 -NonInteractive -ExcludeVersion

 # Components for Java
 RUN add-apt-repository ppa:cwchien/gradle && \
--- a/tools/ci-scripts/windows/Install-Stack.ps1
+++ b/tools/ci-scripts/windows/Install-Stack.ps1
@ -0,0 +1,32 @@
+[CmdletBinding()]
+param ( )
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+Add-Type -AssemblyName 'System.IO.Compression.FileSystem'
+
+$OutputDirectory = [System.IO.Path]::Combine(
+    [System.IO.Path]::GetTempPath(),
+    [System.IO.Path]::GetRandomFileName())
+
+if (-not (Test-Path -LiteralPath $OutputDirectory -PathType Container))
+{
+    mkdir $OutputDirectory | Out-Null
+}
+
+$stackInstaller = [System.IO.Path]::Combine($OutputDirectory, 'stack-x86_64.zip')
+Write-Debug "Downloading to $stackInstaller"
+
+[System.Net.ServicePointManager]::SecurityProtocol='TLS12'
+Invoke-WebRequest `
+    -Uri https://www.stackage.org/stack/windows-x86_64 `
+    -OutFile $stackInstaller
+
+$InstallDirectory = [System.IO.Path]::Combine($OutputDirectory, 'stack')
+Write-Debug "Extracting to $InstallDirectory"
+
+[System.IO.Compression.ZipFile]::ExtractToDirectory($stackInstaller, $InstallDirectory)
+
+Write-Host "Stack: $(& "$InstallDirectory\stack.exe" --version)"
+Write-Output $InstallDirectory