Skip to content

Commit 5613e7e

Browse files
committed
Address PR feedback.
1 parent f11a4e3 commit 5613e7e

File tree

6 files changed

+6
-221
lines changed

6 files changed

+6
-221
lines changed

OpenConsole.sln

Lines changed: 0 additions & 209 deletions
Large diffs are not rendered by default.

build/Helix/CopyVisualTreeVerificationFiles.ps1

Lines changed: 0 additions & 2 deletions
This file was deleted.

build/Helix/PrepareHelixPayload.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ New-Item -ItemType Directory -Force -Path $payloadDir
1919

2020
# Copy files from nuget packages
2121
Copy-Item "$nugetPackagesDir\microsoft.windows.apps.test.1.0.181203002\lib\netcoreapp2.1\*.dll" $payloadDir
22-
Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.51.200127004\build\Binaries\$Platform\*" $payloadDir
23-
Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.51.200127004\build\Binaries\$Platform\CoreClr\*" $payloadDir
22+
Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\*" $payloadDir
23+
Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\CoreClr\*" $payloadDir
2424
New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
2525
Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
2626
Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
27-
Copy-Item "$nugetPackagesDir\MUXCustomBuildTasks.1.0.48\tools\$platform\WttLog.dll" $payloadDir
2827

2928
function Copy-If-Exists
3029
{

build/Helix/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
4-
<package id="TAEF.Redist.Wlk" version="10.51.200127004" targetFramework="native" />
4+
<package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
55
<package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
66
<package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
77
<package id="runtime.win-x64.microsoft.netcore.app" version="2.1.0" targetFramework="native" />

build/pipelines/templates/build-console-steps.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ steps:
1212
inputs:
1313
versionSpec: 5.2.0
1414

15-
# - task: VisualStudioTestPlatformInstaller@1
16-
# displayName: Ensure VSTest Platform
17-
1815
# In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
1916
# This should be `task: NuGetCommand@2`
2017
- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
@@ -144,7 +141,7 @@ steps:
144141
TargetFolder: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test'
145142
OverWrite: true
146143
flattenFolders: true
147-
condition: and(and(succeeded(), eq(variables['BuildPlatform'], 'x64')), not(eq(variables['Build.Reason'], 'PullRequest')))
144+
condition: and(and(succeeded(), eq(variables['BuildPlatform'], 'x64')), ne(variables['Build.Reason'], 'PullRequest'))
148145

149146
- task: PublishBuildArtifacts@1
150147
displayName: 'Publish All Build Artifacts'

build/scripts/Get-WttLog.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[CmdLetBinding()]
22
Param(
33
[Parameter(Mandatory=$true, Position=0)][string]$BuildPlatform,
4-
[Parameter(Mandatory=$true, Position=1)][string]$RationalizedPlatform,
5-
[Parameter(Mandatory=$true, Position=2)][string]$Configuration
4+
[Parameter(Mandatory=$true, Position=1)][string]$RationalizedPlatform,
5+
[Parameter(Mandatory=$true, Position=2)][string]$Configuration
66
)
77

88

0 commit comments

Comments
 (0)