Fix building issue

suvamM · Sep 17, 2019 · 56f5e34 · 56f5e34
1 parent 45dd63e
commit 56f5e34
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 504 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Nn]upkg/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/Sources/BoogieAST/BoogieAST.csproj b/Sources/BoogieAST/BoogieAST.csproj
@@ -1,9 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <HighEntropyVA>true</HighEntropyVA> 
   </PropertyGroup>
+
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
 </Project>
diff --git a/Sources/SolToBoogie/SolToBoogie.csproj b/Sources/SolToBoogie/SolToBoogie.csproj
@@ -1,28 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project>
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
     <HighEntropyVA>true</HighEntropyVA> 
   </PropertyGroup>
+
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <ProjectReference Include="..\BoogieAST\BoogieAST.csproj" />
     <ProjectReference Include="..\SolidityAST\SolidityAST.csproj" />
   </ItemGroup>
 
-   <ItemGroup>
-        <SolcFiles Include="..\..\Tool\**\*.*"/>
-   </ItemGroup> 
-
-  <Target Name="CopySolFiles" AfterTargets="AfterBuild">
-        <Copy
-            SourceFiles="@(SolcFiles)"
-            DestinationFolder="$(OutDir)\solc\"
-        />
-    </Target>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
 </Project>
diff --git a/Sources/SolToBoogieTest/SolToBoogieTest.csproj b/Sources/SolToBoogieTest/SolToBoogieTest.csproj
@@ -1,34 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>VeriSolRegressionRunner</ToolCommandName>
-    <VeriSolPublishDir>..\..\Binaries\</VeriSolPublishDir>
   </PropertyGroup>
 
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <ProjectReference Include="..\SolidityAST\SolidityAST.csproj" />
     <ProjectReference Include="..\BoogieAST\BoogieAST.csproj" />
     <ProjectReference Include="..\SolToBoogie\SolToBoogie.csproj" />
-    <ProjectReference Include="..\..\corral\cba-NetCore.csproj" />
-    <ProjectReference Include="..\..\corral\boogie\Source\BoogieDriver\BoogieDriver-NetCore.csproj" />
   </ItemGroup>
 
-   <ItemGroup>
-        <CorralFiles Include="..\..\corral\bin\Debug\netcoreapp2.2\corral.runtimeconfig.json"/>
-        <Z3Files Include="..\..\Tool\z3*"/>
-        <SolToBoogieTestDlls Include="$(OutDir)\**\*.*"/>
-   </ItemGroup> 
-  <Target Name="CopySolToBoogieTestDlls" AfterTargets="Publish">
-        <Copy
-            SourceFiles="@(SolToBoogieTestDlls)"
-            DestinationFolder="$(VeriSolPublishDir)\"
-        />
-    </Target>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
 </Project>
diff --git a/Sources/SolidityAST/SolidityAST.csproj b/Sources/SolidityAST/SolidityAST.csproj
@@ -1,16 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <HighEntropyVA>true</HighEntropyVA> 
   </PropertyGroup>
 
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <PackageReference Include="JsonSubTypes" Version="1.4.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
 </Project>
diff --git a/Sources/SolidityCFG/SolidityCFG.csproj b/Sources/SolidityCFG/SolidityCFG.csproj
@@ -1,13 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-   <HighEntropyVA>true</HighEntropyVA> 
+    <HighEntropyVA>true</HighEntropyVA> 
   </PropertyGroup>
 
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <ProjectReference Include="..\SolidityAST\SolidityAST.csproj" />
   </ItemGroup>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
 </Project>
diff --git a/Sources/VeriSol.props b/Sources/VeriSol.props
@@ -0,0 +1,17 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <RepositoryROOT Condition=" '$(RepositoryROOT)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), `.gitignore`))</RepositoryROOT>
+    <OutputPath>$(RepositoryROOT)\bin\$(Configuration)</OutputPath>
+    <BaseIntermediateOutputPath>$(RepositoryROOT)\obj\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <PackageOutputPath>$(RepositoryROOT)\nupkg</PackageOutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <VersionPrefix>0.1.0</VersionPrefix>
+  </PropertyGroup>
+
+</Project>
diff --git a/Sources/SolToBoogie.sln → Sources/VeriSol.sln b/Sources/SolToBoogie.sln → Sources/VeriSol.sln
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolidityCFG", "SolidityCFG\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolToBoogieTest", "SolToBoogieTest\SolToBoogieTest.csproj", "{6F8F5214-7E0C-4377-B5F2-6D3A553AA8D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VeriSolOutOfBandSpecsRunner", "VeriSolRunner\VeriSolOutOfBandSpecsRunner.csproj", "{068C4F28-49B0-448D-AEE2-71DB2908C3B7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeriSol", "VeriSol\VeriSol.csproj", "{2362BC10-65A2-419D-8A41-0FE33FF4FC16}"
 EndProject
 Global
@@ -87,18 +85,6 @@ Global
 		{6F8F5214-7E0C-4377-B5F2-6D3A553AA8D9}.Release|x64.Build.0 = Release|Any CPU
 		{6F8F5214-7E0C-4377-B5F2-6D3A553AA8D9}.Release|x86.ActiveCfg = Release|Any CPU
 		{6F8F5214-7E0C-4377-B5F2-6D3A553AA8D9}.Release|x86.Build.0 = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|x64.Build.0 = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|x64.ActiveCfg = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|x64.Build.0 = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{068C4F28-49B0-448D-AEE2-71DB2908C3B7}.Release|x86.Build.0 = Release|Any CPU
 		{2362BC10-65A2-419D-8A41-0FE33FF4FC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2362BC10-65A2-419D-8A41-0FE33FF4FC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2362BC10-65A2-419D-8A41-0FE33FF4FC16}.Debug|x64.ActiveCfg = Debug|Any CPU

diff --git a/Sources/VeriSol/VeriSol.csproj b/Sources/VeriSol/VeriSol.csproj
@@ -1,17 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <AssemblyName>VeriSol</AssemblyName>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <HighEntropyVA>true</HighEntropyVA> 
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <HighEntropyVA>true</HighEntropyVA>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageId>VeriSol</PackageId>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <RepositoryUrl>https://github.com/microsoft/verisol</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageOutputPath>nupkg</PackageOutputPath>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>VeriSol</ToolCommandName>
   </PropertyGroup>
 
+  <Import Project="..\VeriSol.props" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
@@ -30,4 +37,12 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(RepositoryROOT)\LICENSE.txt" Pack="true" PackagePath="LICENSE.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
 </Project>
diff --git a/Sources/VeriSolRunner/Program.cs b/Sources/VeriSolRunner/Program.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ bld/ @@
     [Bb]in/
     [Oo]bj/
     [Ll]og/
+    [Nn]upkg/
     # Visual Studio 2015/2017 cache/options directory
     .vs/
@@ Expand Down @@