mirror of
https://github.com/danbulant/Cosmos
synced 2026-05-24 12:35:31 +00:00
Merge branch 'master' into memory_handles
This commit is contained in:
commit
cb3a625fd9
4 changed files with 23 additions and 12 deletions
16
install-VS2015.bat
Normal file
16
install-VS2015.bat
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
@REM Delete so if builder fails it wont exist
|
||||||
|
del source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.*
|
||||||
|
|
||||||
|
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "source\Builder.sln" /nologo /maxcpucount /p:Configuration=Debug /p:Platform=x86
|
||||||
|
|
||||||
|
@if not exist source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe goto error
|
||||||
|
|
||||||
|
start source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe -bat -VS2015 %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||||
|
|
||||||
|
@exit
|
||||||
|
|
||||||
|
:Error
|
||||||
|
@echo _
|
||||||
|
@echo _
|
||||||
|
@echo Something went wrong.
|
||||||
|
@pause
|
||||||
|
|
@ -62,6 +62,10 @@
|
||||||
<NoWin32Manifest>true</NoWin32Manifest>
|
<NoWin32Manifest>true</NoWin32Manifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Interop.TaskScheduler">
|
||||||
|
<HintPath>.\Interop.TaskScheduler.dll</HintPath>
|
||||||
|
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||||
|
</Reference>
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
<Reference Include="Microsoft.VisualBasic" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
|
@ -131,17 +135,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Cosmos.ico" />
|
<Resource Include="Cosmos.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<COMReference Include="TaskScheduler">
|
|
||||||
<Guid>{E34CB9F1-C7F7-424C-BE29-027DCC09363A}</Guid>
|
|
||||||
<VersionMajor>1</VersionMajor>
|
|
||||||
<VersionMinor>0</VersionMinor>
|
|
||||||
<Lcid>0</Lcid>
|
|
||||||
<WrapperTool>tlbimp</WrapperTool>
|
|
||||||
<Isolated>False</Isolated>
|
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
|
||||||
</COMReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|
|
||||||
|
|
@ -267,8 +267,10 @@ namespace Cosmos.Build.Builder {
|
||||||
break;
|
break;
|
||||||
case VsVersion.Vs2015:
|
case VsVersion.Vs2015:
|
||||||
CheckVs2015();
|
CheckVs2015();
|
||||||
CheckForInstall("Microsoft Visual Studio 2015 RC SDK", true);
|
CheckForInstall("Microsoft Visual Studio 2015 SDK - ENU", true);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
//works also without, only close of VMWare is not working! CheckNet35Sp1(); // Required by VMWareLib
|
//works also without, only close of VMWare is not working! CheckNet35Sp1(); // Required by VMWareLib
|
||||||
|
|
|
||||||
BIN
source/Cosmos.Build.Builder/Interop.TaskScheduler.dll
Normal file
BIN
source/Cosmos.Build.Builder/Interop.TaskScheduler.dll
Normal file
Binary file not shown.
Loading…
Reference in a new issue