diff --git a/build/.nuget/packages.config b/build/.nuget/packages.config deleted file mode 100644 index 962698d659..0000000000 --- a/build/.nuget/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/build/config/NuGet.config b/build/config/NuGet.config deleted file mode 100644 index 18dd2231af..0000000000 --- a/build/config/NuGet.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/build/pipelines/templates/build-console-audit-job.yml b/build/pipelines/templates/build-console-audit-job.yml index 9a4ae932dd..faf5ec6720 100644 --- a/build/pipelines/templates/build-console-audit-job.yml +++ b/build/pipelines/templates/build-console-audit-job.yml @@ -31,16 +31,6 @@ jobs: restoreSolution: OpenConsole.sln restoreDirectory: '$(Build.SourcesDirectory)\packages' - - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'NuGet restore packages for CI' - inputs: - command: restore - restoreSolution: build/.nuget/packages.config - feedsToUse: config - externalFeedCredentials: 'TAEF NuGet Feed' - nugetConfigPath: build/config/NuGet.config - restoreDirectory: '$(Build.SourcesDirectory)/packages' - - task: VSBuild@1 displayName: 'Build solution **\OpenConsole.sln' inputs: diff --git a/build/pipelines/templates/build-console-steps.yml b/build/pipelines/templates/build-console-steps.yml index d562776952..b301d8a0b1 100644 --- a/build/pipelines/templates/build-console-steps.yml +++ b/build/pipelines/templates/build-console-steps.yml @@ -25,16 +25,6 @@ steps: restoreSolution: OpenConsole.sln restoreDirectory: '$(Build.SourcesDirectory)\packages' -- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'NuGet restore packages for CI' - inputs: - command: restore - restoreSolution: build/.nuget/packages.config - feedsToUse: config - externalFeedCredentials: 'TAEF NuGet Feed' - nugetConfigPath: build/config/NuGet.config - restoreDirectory: '$(Build.SourcesDirectory)/packages' - - task: VSBuild@1 displayName: 'Build solution **\OpenConsole.sln' inputs: diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj index 63b84388ee..d4bec3b026 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj @@ -113,7 +113,7 @@ - $(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.48.200103003-develop\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd + $(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.51.200127004\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd true diff --git a/src/common.build.tests.props b/src/common.build.tests.props index 8e311fe523..8a3527ff6e 100644 --- a/src/common.build.tests.props +++ b/src/common.build.tests.props @@ -5,11 +5,11 @@ UNIT_TESTING;%(PreprocessorDefinitions) - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/src/host/ft_uia/Host.Tests.UIA.csproj b/src/host/ft_uia/Host.Tests.UIA.csproj index 27da40d9e0..a7b81a63cd 100644 --- a/src/host/ft_uia/Host.Tests.UIA.csproj +++ b/src/host/ft_uia/Host.Tests.UIA.csproj @@ -53,7 +53,7 @@ - ..\..\..\packages\Taef.Redist.Wlk.10.48.200103003-develop\lib\net45\TE.Managed.dll + ..\..\..\packages\Taef.Redist.Wlk.10.51.200127004\lib\net45\TE.Managed.dll @@ -64,10 +64,10 @@ ..\..\..\packages\Selenium.Support.3.5.0\lib\net40\WebDriver.Support.dll - ..\..\..\packages\Taef.Redist.Wlk.10.48.200103003-develop\lib\net45\Wex.Common.Managed.dll + ..\..\..\packages\Taef.Redist.Wlk.10.51.200127004\lib\net45\Wex.Common.Managed.dll - ..\..\..\packages\Taef.Redist.Wlk.10.48.200103003-develop\lib\net45\Wex.Logger.Interop.dll + ..\..\..\packages\Taef.Redist.Wlk.10.51.200127004\lib\net45\Wex.Logger.Interop.dll @@ -142,11 +142,11 @@ copy $(SolutionDir)\dep\WinAppDriver\* $(OutDir)\ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/src/host/ft_uia/packages.config b/src/host/ft_uia/packages.config index 5748a55a66..7071ce72f3 100644 --- a/src/host/ft_uia/packages.config +++ b/src/host/ft_uia/packages.config @@ -5,5 +5,5 @@ - + diff --git a/src/terminal/parser/ut_parser/packages.config b/src/terminal/parser/ut_parser/packages.config index 4d24d77853..42477ca456 100644 --- a/src/terminal/parser/ut_parser/packages.config +++ b/src/terminal/parser/ut_parser/packages.config @@ -1,4 +1,4 @@  - + diff --git a/tools/OpenConsole.psm1 b/tools/OpenConsole.psm1 index d2a085b913..15d3d1b602 100644 --- a/tools/OpenConsole.psm1 +++ b/tools/OpenConsole.psm1 @@ -189,7 +189,7 @@ function Invoke-OpenConsoleTests() } $OpenConsolePath = "$env:OpenConsoleroot\bin\$OpenConsolePlatform\$Configuration\OpenConsole.exe" $RunTePath = "$env:OpenConsoleRoot\tools\runte.cmd" - $TaefExePath = "$env:OpenConsoleRoot\packages\Taef.Redist.Wlk.10.48.200103003-develop\build\Binaries\$Platform\te.exe" + $TaefExePath = "$env:OpenConsoleRoot\packages\Taef.Redist.Wlk.10.51.200127004\build\Binaries\$Platform\te.exe" $BinDir = "$env:OpenConsoleRoot\bin\$OpenConsolePlatform\$Configuration" [xml]$TestConfig = Get-Content "$env:OpenConsoleRoot\tools\tests.xml" diff --git a/tools/razzle.cmd b/tools/razzle.cmd index 18cc2dadd2..0851160f9e 100644 --- a/tools/razzle.cmd +++ b/tools/razzle.cmd @@ -104,7 +104,7 @@ shift goto :ARGS_LOOP :POST_ARGS_LOOP -set TAEF=%OPENCON%\packages\Taef.Redist.Wlk.10.48.200103003-develop\build\Binaries\%ARCH%\TE.exe +set TAEF=%OPENCON%\packages\Taef.Redist.Wlk.10.51.200127004\build\Binaries\%ARCH%\TE.exe rem Set this envvar so setup won't repeat itself set OpenConBuild=true