Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Cleaning up some build issues (#176)
Browse files Browse the repository at this point in the history 
Updating TFS build scripts and package generation scripts.
  • Loading branch information
@jplafonta
jplafonta authored Dec 11, 2017
1 parent 10f1a2a commit 133e1d3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 57 deletions.
6 changes: 3 additions & 3 deletions Build/InstallXboxLiveSdk.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ elseif($FromSource)
{
& $nugetCmd restore $sdkSln

Write-Host "Building (configuration DebugNET35) Xbox Live SDK... "
$buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Configuration=DebugNET35"
Write-Host "Building (configuration ReleaseNET35) Xbox Live SDK... "
$buildResult = Invoke-MsBuild $sdkSln -BuildLogDirectoryPath $PSScriptRoot -ShowBuildOutputInCurrentWindow -Params "/property:Configuration=ReleaseNET35"

if(!$buildResult.BuildSucceeded)
{
Expand All @@ -85,7 +85,7 @@ elseif($FromSource)
Write-Host "Error Log: $($buildResult.BuildErrorsLogFilePath)"
}
else {
Write-Host "SDK Build (configuration DebugNET35) Succeeded."
Write-Host "SDK Build (configuration ReleaseNET35) Succeeded."
}

Write-Host "Building Xbox Live SDK... "
Expand Down
55 changes: 2 additions & 53 deletions CSharpSource/Source/Microsoft.Xbox.Services.CSharp.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Global
api\Microsoft.Xbox.Services.Shared.projitems*{035e5e11-4a0b-4d1f-ba13-9b62ccafb2b8}*SharedItemsImports = 13
api\Microsoft.Xbox.Services.Shared.projitems*{b7130c4b-b36b-4449-80b0-60037fc2e0cd}*SharedItemsImports = 4
api\Microsoft.Xbox.Services.Shared.projitems*{cbd81e44-f37f-47d6-b71b-a43a748ae09c}*SharedItemsImports = 4
api\Microsoft.Xbox.Services.Shared.projitems*{cfb2ca8f-6611-4dca-981c-4b7afcca19a8}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Expand Down Expand Up @@ -79,8 +78,8 @@ Global
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|ARM.Build.0 = ReleaseNET46|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.ActiveCfg = ReleaseNET46|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x64.Build.0 = ReleaseNET46|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.ActiveCfg = ReleaseNET35|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.Build.0 = ReleaseNET35|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.ActiveCfg = ReleaseNET46|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.Release|x86.Build.0 = ReleaseNET46|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|ARM.ActiveCfg = ReleaseNET35|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|ARM.Build.0 = ReleaseNET35|Any CPU
{B7130C4B-B36B-4449-80B0-60037FC2E0CD}.ReleaseNET35|x64.ActiveCfg = ReleaseNET35|Any CPU
Expand Down Expand Up @@ -157,60 +156,10 @@ Global
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|ARM.Build.0 = Release|ARM
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|ARM.Deploy.0 = Release|ARM
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x64.ActiveCfg = Release|x64
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x64.Build.0 = Release|x64
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x64.Deploy.0 = Release|x64
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.Release|x86.ActiveCfg = Release|x86
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|x64.ActiveCfg = Release|x64
{4C1806D5-7279-4DFC-8874-13D66D52A31B}.ReleaseNET35|x86.ActiveCfg = Release|x86
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|ARM.ActiveCfg = Debug|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|ARM.Build.0 = Debug|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x64.ActiveCfg = Debug|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x64.Build.0 = Debug|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x86.ActiveCfg = Debug|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.Debug|x86.Build.0 = Debug|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|ARM.ActiveCfg = Debug|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|ARM.Build.0 = Debug|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x64.ActiveCfg = Debug|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x64.Build.0 = Debug|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x86.ActiveCfg = Debug|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.DebugNET35|x86.Build.0 = Debug|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|ARM.ActiveCfg = Release|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|ARM.Build.0 = Release|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x64.ActiveCfg = Release|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x64.Build.0 = Release|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x86.ActiveCfg = Release|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.Release|x86.Build.0 = Release|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|ARM.Build.0 = Release|ARM
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x64.ActiveCfg = Release|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x64.Build.0 = Release|x64
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x86.ActiveCfg = Release|Win32
{8F96710E-5169-4917-8874-7DE248F4D243}.ReleaseNET35|x86.Build.0 = Release|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|ARM.ActiveCfg = Debug|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|ARM.Build.0 = Debug|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x64.ActiveCfg = Debug|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x64.Build.0 = Debug|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x86.ActiveCfg = Debug|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Debug|x86.Build.0 = Debug|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|ARM.ActiveCfg = Debug|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|ARM.Build.0 = Debug|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x64.ActiveCfg = Debug|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x64.Build.0 = Debug|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x86.ActiveCfg = Debug|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.DebugNET35|x86.Build.0 = Debug|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|ARM.ActiveCfg = Release|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|ARM.Build.0 = Release|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x64.ActiveCfg = Release|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x64.Build.0 = Release|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x86.ActiveCfg = Release|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.Release|x86.Build.0 = Release|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|ARM.ActiveCfg = Release|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|ARM.Build.0 = Release|ARM
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x64.ActiveCfg = Release|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x64.Build.0 = Release|x64
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x86.ActiveCfg = Release|Win32
{1B0DFB7F-2CD5-48DE-80D4-5CC56C22AEEE}.ReleaseNET35|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 5 additions & 1 deletion Utilities/VSOBuildScripts/postBuildScript.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@echo on
if "%1" == "local" goto testlocal
goto start

Expand All @@ -20,7 +21,10 @@ set libPath=%exportPath%\Libs

mkdir "%exportPath%\Libs"

robocopy /NJS /NJH /MT:16 /S /NP "%TFS_SourcesDirectory%\Source\CSharpSource\binaries\Layout\Release" "%libPath%"
mkdir "%exportPath%\Xbox Live\Libs"

robocopy /NJS /NJH /MT:16 /S /NP "%TFS_DropLocation%\UWP" "%libPath%\UWP"
robocopy /NJS /NJH /MT:16 /S /NP "%TFS_DropLocation%\UnityEditor" "%libPath%\UnityEditor"

mkdir %TFS_DropLocation%\Packages

Expand Down

0 comments on commit 133e1d3

Please sign in to comment.