diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index 2de1c7897..28d2535bc 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -546,13 +546,17 @@
       <LastGenOutput>Instructions.cs</LastGenOutput>
     </None>
     <None Include="packages.config" />
-    <None Include="Properties\AssemblyInfo.template.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>
+    <ProjectReference Include="ICSharpCode.Decompiler.netstd.csproj">
+      <Project>{fd56f486-a0c3-4469-b6d3-d2bae23ce2a0}</Project>
+      <Name>ICSharpCode.Decompiler.netstd</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
index 6df2039b0..544248968 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
@@ -1,42 +1,56 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-	<AssemblyName>ICSharpCode.Decompiler</AssemblyName>
-	<RootNamespace>ICSharpCode.Decompiler</RootNamespace>
-	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	<SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Ast\**" />
-    <EmbeddedResource Remove="Ast\**" />
-    <None Remove="Ast\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="CodeMappings.cs" />
-    <Compile Remove="CSharp\Transforms\CombineQueryExpressions.cs" />
-    <Compile Remove="CSharp\Transforms\ExpressionTreeConverter.cs" />
-    <Compile Remove="CSharp\Transforms\FlattenSwitchBlocks.cs" />
-    <Compile Remove="CSharp\Transforms\IntroduceQueryExpressions.cs" />
-    <Compile Remove="DecompilerException.cs" />
-    <Compile Remove="Properties\AssemblyInfo.template.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\cecil\Mono.Cecil.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<AssemblyName>ICSharpCode.Decompiler</AssemblyName>
+		<RootNamespace>ICSharpCode.Decompiler</RootNamespace>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Remove="Ast\**" />
+		<EmbeddedResource Remove="Ast\**" />
+		<None Remove="Ast\**" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Remove="CodeMappings.cs" />
+		<Compile Remove="CSharp\Transforms\CombineQueryExpressions.cs" />
+		<Compile Remove="CSharp\Transforms\ExpressionTreeConverter.cs" />
+		<Compile Remove="CSharp\Transforms\FlattenSwitchBlocks.cs" />
+		<Compile Remove="CSharp\Transforms\IntroduceQueryExpressions.cs" />
+		<Compile Remove="DecompilerException.cs" />
+		<Compile Remove="Properties\AssemblyInfo.template.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+		<PackageReference Include="System.ValueTuple" Version="4.4.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\cecil\Mono.Cecil.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Folder Include="Properties\" />
+	</ItemGroup>
+
+	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+		<PropertyGroup>
+			<UpdateAssemblyInfo>UpdateAssemblyInfo.exe</UpdateAssemblyInfo>
+			<UpdateAssemblyInfo Condition="$(OS)=='Unix'">mono $(UpdateAssemblyInfo)</UpdateAssemblyInfo>
+		</PropertyGroup>
+		<MSBuild Projects="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug" />
+		<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo) --branchname $(BranchName)" Timeout="60000" Condition=" '$(BranchName)' != '' " />
+		<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition=" '$(BranchName)' == '' " />
+	</Target>
+
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command="del /F /S /Q $(ProjectDir)\obj" />
+	</Target>
 
 </Project>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 9b2f33ac5..36241bde9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ before_build:
 - nuget restore ILSpy.sln
 build:
   project: ILSpy.sln
-  parallel: true
+  parallel: false
   verbosity: minimal
 test:
   assemblies: