diff options
| author | j-p <jp_bruyere@hotmail.com> | 2020-01-26 00:57:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 00:57:12 +0100 |
| commit | b864a030fdc14912bd1aba6c416d805715079914 (patch) | |
| tree | 5ee3f34a9f6ac0929a14b18c2e619c2fa913a1f1 | |
| parent | 95f1366da59f9b1ed6069b8b85d40ba9bf6fcb39 (diff) | |
Appveyor (#8)
update csproj's to build with msbuild and dotnet on win and linux.
| -rw-r--r-- | VK/vulkan.csproj | 19 | ||||
| -rw-r--r-- | appveyor.yml | 42 | ||||
| -rw-r--r-- | vk.generator/vk.generator.csproj | 9 | ||||
| -rw-r--r-- | vk.net.sln | 20 |
4 files changed, 71 insertions, 19 deletions
diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj index cb54f13..000e5af 100644 --- a/VK/vulkan.csproj +++ b/VK/vulkan.csproj @@ -22,6 +22,12 @@ <ItemGroup> <Content Include="vk.net-64.png" Pack="true" PackagePath="" /> <Compile Include="$(SolutionDir)build/generated/*.cs" /> + <ProjectReference Include="../vk.generator/vk.generator.csproj"> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="../vk.rewrite/vk.rewrite.csproj"> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> </ItemGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -33,6 +39,19 @@ <DefineConstants>NETSTANDARD;NETSTANDARD2_0</DefineConstants> </PropertyGroup> + <Target Name="generate" BeforeTargets="BeforeCompile"> + <MakeDir Directories="$(SolutionDir)build/generated" /> + <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)build/$(Configuration)/net471/vk.generator.exe" WorkingDirectory="$(SolutionDir)build/generated"> + <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" /> + </Exec> + <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(SolutionDir)build/$(Configuration)/net471/vk.generator.exe" WorkingDirectory="$(SolutionDir)build/generated"> + <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" /> + </Exec> + <CreateItem Include="$(SolutionDir)build/generated/*.cs"> + <Output TaskParameter="Include" ItemName="Compile" /> + </CreateItem> + </Target> + <Target Name="rewrite" AfterTargets="CoreBuild"> <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)build/$(Configuration)/net471/vk.rewrite.exe $(TargetPath)" ConsoleToMSBuild="true" EchoOff="true"> <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" /> diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..1543cd4 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,42 @@ +version: 1.0.{build} + +image: + - Visual Studio 2019 + - Ubuntu + + +build: + verbosity: minimal + +for: + - + matrix: + only: + - image: Visual Studio 2019 + environment: + VULKAN_SDK: C:/VulkanSDK/1.1.130.0 + APPVEYOR_SAVE_CACHE_ON_ERROR: true + cache: + - VulkanSDK.exe + - c:\VulkanSDK\ + install: + - if not exist VulkanSDK.exe curl -L --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.130.0/windows/VulkanSDK-1.1.130.0-Installer.exe?Human=true && VulkanSDK.exe /S + build_script: + - msbuild /p:Configuration=Release /t:restore + - msbuild /p:Configuration=Release + + - + matrix: + only: + - image: Ubuntu + environment: + FrameworkPathOverride: /usr/lib/mono/4.5/ + install: + - wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - + - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-bionic.list https://packages.lunarg.com/vulkan/lunarg-vulkan-bionic.list + - sudo apt -qq update + - sudo apt -y install vulkan-sdk + - glslc --version + build_script: + - dotnet build /p:Configuration=Release + diff --git a/vk.generator/vk.generator.csproj b/vk.generator/vk.generator.csproj index 7fb509f..73f8f44 100644 --- a/vk.generator/vk.generator.csproj +++ b/vk.generator/vk.generator.csproj @@ -10,13 +10,4 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> - <Target Name="generate" AfterTargets="CoreBuild"> - <MakeDir Directories="$(SolutionDir)build/generated" /> - <Exec Condition="$(OS) == 'Windows_NT'" Command="$(TargetPath)" WorkingDirectory="$(SolutionDir)build/generated"> - <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" /> - </Exec> - <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(TargetPath)" WorkingDirectory="$(SolutionDir)build/generated"> - <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" /> - </Exec> - </Target> </Project>
\ No newline at end of file @@ -2,10 +2,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vk.generator", "vk.generator\vk.generator.csproj", "{B105512C-9461-4802-B299-A6E7A29CDAEE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vk.rewrite", "vk.rewrite\vk.rewrite.csproj", "{5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vulkan", "VK\vulkan.csproj", "{37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vk.rewrite", "vk.rewrite\vk.rewrite.csproj", "{5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -14,16 +14,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {B105512C-9461-4802-B299-A6E7A29CDAEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B105512C-9461-4802-B299-A6E7A29CDAEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B105512C-9461-4802-B299-A6E7A29CDAEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B105512C-9461-4802-B299-A6E7A29CDAEE}.Release|Any CPU.Build.0 = Release|Any CPU - {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Release|Any CPU.Build.0 = Release|Any CPU + {B105512C-9461-4802-B299-A6E7A29CDAEE}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {B105512C-9461-4802-B299-A6E7A29CDAEE}.Release|Any CPU.Build.0 = Debug|Any CPU {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Release|Any CPU.Build.0 = Release|Any CPU + {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {37D01BE5-5FE2-4742-BD5B-5D2C25FCF146}.Release|Any CPU.Build.0 = Debug|Any CPU + {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5EC0F6C6-74C9-4509-8AC8-FAE3574AF5C7}.Release|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution EndGlobalSection |