From 3114bebffed1b283460349112651b7c3286bf276 Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Wed, 9 Mar 2016 12:53:33 -0600 Subject: [PATCH 1/5] Enable build for some projects for testing. --- source/Cosmos.sln | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source/Cosmos.sln b/source/Cosmos.sln index e52856149..99db4fa7c 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -395,10 +395,12 @@ Global {B97A2956-C363-47F2-A6AA-B4FCCFF4D315}.Release|x86.ActiveCfg = Release|x86 {B97A2956-C363-47F2-A6AA-B4FCCFF4D315}.Release|x86.Build.0 = Release|x86 {73CF15C1-0AB6-4B3A-8142-D326ADA72970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73CF15C1-0AB6-4B3A-8142-D326ADA72970}.Debug|Any CPU.Build.0 = Debug|Any CPU {73CF15C1-0AB6-4B3A-8142-D326ADA72970}.Debug|x86.ActiveCfg = Debug|x86 {73CF15C1-0AB6-4B3A-8142-D326ADA72970}.Release|Any CPU.ActiveCfg = Release|Any CPU {73CF15C1-0AB6-4B3A-8142-D326ADA72970}.Release|x86.ActiveCfg = Release|x86 {5B2C0369-7A84-4113-892C-F71B50E1DA12}.Debug|Any CPU.ActiveCfg = Debug|x86 + {5B2C0369-7A84-4113-892C-F71B50E1DA12}.Debug|Any CPU.Build.0 = Debug|x86 {5B2C0369-7A84-4113-892C-F71B50E1DA12}.Debug|x86.ActiveCfg = Debug|x86 {5B2C0369-7A84-4113-892C-F71B50E1DA12}.Debug|x86.Build.0 = Debug|x86 {5B2C0369-7A84-4113-892C-F71B50E1DA12}.Release|Any CPU.ActiveCfg = Release|x86 @@ -582,6 +584,7 @@ Global {57045FE8-B0FE-4FC1-810F-7C3914AEF1DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {57045FE8-B0FE-4FC1-810F-7C3914AEF1DE}.Release|x86.ActiveCfg = Release|x86 {73D29A51-072A-4310-B3D1-539AA92094AA}.Debug|Any CPU.ActiveCfg = Debug|x86 + {73D29A51-072A-4310-B3D1-539AA92094AA}.Debug|Any CPU.Build.0 = Debug|x86 {73D29A51-072A-4310-B3D1-539AA92094AA}.Debug|x86.ActiveCfg = Debug|x86 {73D29A51-072A-4310-B3D1-539AA92094AA}.Debug|x86.Build.0 = Debug|x86 {73D29A51-072A-4310-B3D1-539AA92094AA}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -599,6 +602,7 @@ Global {BDC011BE-6041-4A58-A6E7-0F592E78CB27}.Release|Any CPU.ActiveCfg = Release|Any CPU {BDC011BE-6041-4A58-A6E7-0F592E78CB27}.Release|x86.ActiveCfg = Release|x86 {7E059184-F2C5-4CC6-B86D-FA12590C3C40}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7E059184-F2C5-4CC6-B86D-FA12590C3C40}.Debug|Any CPU.Build.0 = Debug|x86 {7E059184-F2C5-4CC6-B86D-FA12590C3C40}.Debug|x86.ActiveCfg = Debug|x86 {7E059184-F2C5-4CC6-B86D-FA12590C3C40}.Debug|x86.Build.0 = Debug|x86 {7E059184-F2C5-4CC6-B86D-FA12590C3C40}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -664,6 +668,7 @@ Global {839EDC9D-6D2E-4892-A7F0-17861BA9FA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {839EDC9D-6D2E-4892-A7F0-17861BA9FA0C}.Release|x86.ActiveCfg = Release|x86 {431643CB-006C-49EF-8E0F-1540F994C936}.Debug|Any CPU.ActiveCfg = Debug|x86 + {431643CB-006C-49EF-8E0F-1540F994C936}.Debug|Any CPU.Build.0 = Debug|x86 {431643CB-006C-49EF-8E0F-1540F994C936}.Debug|x86.ActiveCfg = Debug|x86 {431643CB-006C-49EF-8E0F-1540F994C936}.Debug|x86.Build.0 = Debug|x86 {431643CB-006C-49EF-8E0F-1540F994C936}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -676,6 +681,7 @@ Global {21915A7E-CC84-4836-8B87-857B6149D496}.Release|Any CPU.ActiveCfg = Release|Any CPU {21915A7E-CC84-4836-8B87-857B6149D496}.Release|x86.ActiveCfg = Release|x86 {78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Debug|Any CPU.Build.0 = Debug|x86 {78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Debug|x86.ActiveCfg = Debug|x86 {78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Debug|x86.Build.0 = Debug|x86 {78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -692,6 +698,7 @@ Global {F8889473-5866-4913-86AC-8072A1A2558C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8889473-5866-4913-86AC-8072A1A2558C}.Release|x86.ActiveCfg = Release|x86 {444098BC-8F72-4030-A8C0-118D2DD93EB8}.Debug|Any CPU.ActiveCfg = Debug|x86 + {444098BC-8F72-4030-A8C0-118D2DD93EB8}.Debug|Any CPU.Build.0 = Debug|x86 {444098BC-8F72-4030-A8C0-118D2DD93EB8}.Debug|x86.ActiveCfg = Debug|x86 {444098BC-8F72-4030-A8C0-118D2DD93EB8}.Debug|x86.Build.0 = Debug|x86 {444098BC-8F72-4030-A8C0-118D2DD93EB8}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -704,6 +711,7 @@ Global {3E28CFD9-25D4-4EBB-86E3-4A4A8A8936FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E28CFD9-25D4-4EBB-86E3-4A4A8A8936FE}.Release|x86.ActiveCfg = Release|x86 {41EFAEB7-7D53-4F6B-AE63-CFDA84A22A38}.Debug|Any CPU.ActiveCfg = Debug|x86 + {41EFAEB7-7D53-4F6B-AE63-CFDA84A22A38}.Debug|Any CPU.Build.0 = Debug|x86 {41EFAEB7-7D53-4F6B-AE63-CFDA84A22A38}.Debug|x86.ActiveCfg = Debug|x86 {41EFAEB7-7D53-4F6B-AE63-CFDA84A22A38}.Debug|x86.Build.0 = Debug|x86 {41EFAEB7-7D53-4F6B-AE63-CFDA84A22A38}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -716,6 +724,7 @@ Global {31E3F8E2-7CC0-426C-ACCB-77B3319AF5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {31E3F8E2-7CC0-426C-ACCB-77B3319AF5D3}.Release|x86.ActiveCfg = Release|x86 {ACD31367-B823-44E2-BABB-1605F26DB107}.Debug|Any CPU.ActiveCfg = Debug|x86 + {ACD31367-B823-44E2-BABB-1605F26DB107}.Debug|Any CPU.Build.0 = Debug|x86 {ACD31367-B823-44E2-BABB-1605F26DB107}.Debug|x86.ActiveCfg = Debug|x86 {ACD31367-B823-44E2-BABB-1605F26DB107}.Debug|x86.Build.0 = Debug|x86 {ACD31367-B823-44E2-BABB-1605F26DB107}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -728,6 +737,7 @@ Global {A0893493-D4F0-4B9F-9826-86319E143D86}.Release|Any CPU.ActiveCfg = Release|Any CPU {A0893493-D4F0-4B9F-9826-86319E143D86}.Release|x86.ActiveCfg = Release|x86 {C006CC79-7FFD-45F1-AD8C-57AC879CC29F}.Debug|Any CPU.ActiveCfg = Debug|x86 + {C006CC79-7FFD-45F1-AD8C-57AC879CC29F}.Debug|Any CPU.Build.0 = Debug|x86 {C006CC79-7FFD-45F1-AD8C-57AC879CC29F}.Debug|x86.ActiveCfg = Debug|x86 {C006CC79-7FFD-45F1-AD8C-57AC879CC29F}.Debug|x86.Build.0 = Debug|x86 {C006CC79-7FFD-45F1-AD8C-57AC879CC29F}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -740,6 +750,7 @@ Global {9DF5C0A9-B91C-4647-B939-E47513743A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {9DF5C0A9-B91C-4647-B939-E47513743A0C}.Release|x86.ActiveCfg = Release|x86 {85E13410-C85A-4B0C-BEE5-F9A120ECC94E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {85E13410-C85A-4B0C-BEE5-F9A120ECC94E}.Debug|Any CPU.Build.0 = Debug|x86 {85E13410-C85A-4B0C-BEE5-F9A120ECC94E}.Debug|x86.ActiveCfg = Debug|x86 {85E13410-C85A-4B0C-BEE5-F9A120ECC94E}.Debug|x86.Build.0 = Debug|x86 {85E13410-C85A-4B0C-BEE5-F9A120ECC94E}.Release|Any CPU.ActiveCfg = Debug|x86 @@ -762,6 +773,7 @@ Global {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Release|Any CPU.ActiveCfg = Release|Any CPU {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Release|x86.ActiveCfg = Release|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|Any CPU.ActiveCfg = Debug|x86 + {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|Any CPU.Build.0 = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|x86.ActiveCfg = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|x86.Build.0 = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Release|Any CPU.ActiveCfg = Debug|x86 From 7612adb0a9e10f192fe7a239c12f4ddc7f62ed4e Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Wed, 9 Mar 2016 16:00:04 -0600 Subject: [PATCH 2/5] Changed build playform in Appveyor. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b1a309636..5fe286e7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: 0.20150918.{build} configuration: Debug -platform: x86 +platform: Any CPU shallow_clone: true clone_folder: c:\Cosmos build_script: From 2846d8525ec2c586a74f313e4bf2e94540e38513 Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Wed, 9 Mar 2016 18:53:36 -0600 Subject: [PATCH 3/5] Appveyor and solution config changes. --- appveyor.yml | 6 +++--- source/Builder.sln | 6 ++++-- .../Cosmos.Build.Builder.csproj | 20 ++++++++++++++++++- .../Cosmos.Build.Installer.csproj | 18 +++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5fe286e7a..718ba41bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,10 @@ build_script: rem %APPVEYOR_BUILD_FOLDER% - msbuild "source\Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x86 /p:Configuration=Debug /p:DeployExtension=false + msbuild "source\Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:DeployExtension=false - msbuild "source\Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x86 /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false + msbuild "source\Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false xcopy /Y "%APPVEYOR_BUILD_FOLDER%\Build\VSIP\Cosmos.targets" "%ProgramFiles(x86)%\MSBuild\Cosmos\" @@ -42,7 +42,7 @@ build_script: reg add HKCR\BochsConfigFile\shell\Run\command /ve /d "\"C:\Program Files (x86)\Bochs-2.6.8\Bochs.exe\" -q -f \"%1\"" - msbuild "source\Cosmos.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x86 /p:Configuration=Debug /p:DeployExtension=false + msbuild "source\Cosmos.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:DeployExtension=false notifications: - provider: Webhook url: https://webhooks.gitter.im/e/a0ff70f4ffc77a2d07a0 diff --git a/source/Builder.sln b/source/Builder.sln index 1198f301f..3389301c7 100644 --- a/source/Builder.sln +++ b/source/Builder.sln @@ -17,7 +17,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|Any CPU.ActiveCfg = Debug|x86 + {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|Mixed Platforms.Build.0 = Debug|x86 {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Debug|x86.ActiveCfg = Debug|x86 @@ -27,7 +28,8 @@ Global {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Release|Mixed Platforms.Build.0 = Release|x86 {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Release|x86.ActiveCfg = Release|x86 {74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}.Release|x86.Build.0 = Release|x86 - {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|Any CPU.ActiveCfg = Debug|x86 + {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|Any CPU.Build.0 = Debug|Any CPU {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|Mixed Platforms.Build.0 = Debug|x86 {27D94586-FE88-4203-BE6A-C99013FD5018}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj index 5f3ac758b..395b88cef 100644 --- a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj +++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj @@ -36,7 +36,7 @@ prompt false - + true bin\Debug\ DEBUG;TRACE @@ -57,6 +57,24 @@ true + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + .\Interop.TaskScheduler.dll diff --git a/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj b/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj index e66035a48..b7bd021cc 100644 --- a/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj +++ b/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj @@ -60,6 +60,24 @@ 4 false + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + From 76da5884a3a7221615c257a8c7adc2d015b17c6c Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Wed, 9 Mar 2016 19:06:21 -0600 Subject: [PATCH 4/5] Build platform needed a space. --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 718ba41bf..4bd0c755f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,10 @@ build_script: rem %APPVEYOR_BUILD_FOLDER% - msbuild "source\Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:DeployExtension=false + msbuild "source\Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false - msbuild "source\Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false + msbuild "source\Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false xcopy /Y "%APPVEYOR_BUILD_FOLDER%\Build\VSIP\Cosmos.targets" "%ProgramFiles(x86)%\MSBuild\Cosmos\" @@ -42,7 +42,7 @@ build_script: reg add HKCR\BochsConfigFile\shell\Run\command /ve /d "\"C:\Program Files (x86)\Bochs-2.6.8\Bochs.exe\" -q -f \"%1\"" - msbuild "source\Cosmos.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=AnyCPU /p:Configuration=Debug /p:DeployExtension=false + msbuild "source\Cosmos.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false notifications: - provider: Webhook url: https://webhooks.gitter.im/e/a0ff70f4ffc77a2d07a0 From b542871886f510d00e88e2050bca1c6fdf90b9aa Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Wed, 9 Mar 2016 19:16:28 -0600 Subject: [PATCH 5/5] Don't build linq tests. --- source/Cosmos.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/Cosmos.sln b/source/Cosmos.sln index 99db4fa7c..92da74abe 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -768,12 +768,10 @@ Global {6BAD532A-7DD4-4BAC-834A-10BA6497E19D}.Release|Any CPU.ActiveCfg = Release|Any CPU {6BAD532A-7DD4-4BAC-834A-10BA6497E19D}.Release|x86.ActiveCfg = Release|x86 {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Debug|Any CPU.Build.0 = Debug|Any CPU {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Debug|x86.ActiveCfg = Debug|x86 {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Release|Any CPU.ActiveCfg = Release|Any CPU {85B11F78-39BC-4CFC-9033-FC84AB14CD03}.Release|x86.ActiveCfg = Release|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|Any CPU.Build.0 = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|x86.ActiveCfg = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Debug|x86.Build.0 = Debug|x86 {BA23CC1E-ACA2-4E1E-B10F-FD543393BEE6}.Release|Any CPU.ActiveCfg = Debug|x86