diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt index 6b8bd612920..652be19189b 100644 --- a/.github/actions/spelling/expect/expect.txt +++ b/.github/actions/spelling/expect/expect.txt @@ -52,6 +52,7 @@ apimswincoresynchl apiset APPBARDATA appconsult +appcontainer APPICON appium applet @@ -1626,6 +1627,7 @@ NTVDM ntverp NTWIN nuget +nugetversions nullability nullness nullonfailure diff --git a/OpenConsole.sln b/OpenConsole.sln index 45613781537..f53e2cc56b3 100644 --- a/OpenConsole.sln +++ b/OpenConsole.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29001.49 @@ -290,9 +289,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Props", "Common Prop src\common.build.post.props = src\common.build.post.props src\common.build.pre.props = src\common.build.pre.props src\common.build.tests.props = src\common.build.tests.props + src\common.nugetversions.props = src\common.nugetversions.props + src\common.nugetversions.targets = src\common.nugetversions.targets common.openconsole.props = common.openconsole.props src\cppwinrt.build.post.props = src\cppwinrt.build.post.props src\cppwinrt.build.pre.props = src\cppwinrt.build.pre.props + dep\nuget\packages.config = dep\nuget\packages.config src\wap-common.build.post.props = src\wap-common.build.post.props src\wap-common.build.pre.props = src\wap-common.build.pre.props EndProjectSection diff --git a/build/pipelines/release.yml b/build/pipelines/release.yml index bbe1d0570b7..cd2cc038c1a 100644 --- a/build/pipelines/release.yml +++ b/build/pipelines/release.yml @@ -122,6 +122,14 @@ jobs: selectOrConfig: config nugetConfigPath: NuGet.Config arguments: restore OpenConsole.sln -SolutionDirectory $(Build.SourcesDirectory) + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: Restore NuGet packages for global nuget + inputs: + command: restore + feedsToUse: config + configPath: NuGet.config + restoreSolution: dep/nuget/packages.config + restoreDirectory: '$(Build.SourcesDirectory)\packages' # Pull the Windows SDK for the developer tools like the debuggers so we can index sources later - template: .\templates\install-winsdk-steps.yml - task: UniversalPackages@0 diff --git a/build/pipelines/templates/build-console-audit-job.yml b/build/pipelines/templates/build-console-audit-job.yml index f84c5bca520..591c2a7b12e 100644 --- a/build/pipelines/templates/build-console-audit-job.yml +++ b/build/pipelines/templates/build-console-audit-job.yml @@ -8,7 +8,7 @@ jobs: variables: BuildConfiguration: AuditMode BuildPlatform: ${{ parameters.platform }} - pool: + pool: ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: @@ -48,6 +48,17 @@ jobs: restoreSolution: OpenConsole.sln restoreDirectory: '$(Build.SourcesDirectory)\packages' + # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous. + # This should be `task: NuGetCommand@2` + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: Restore NuGet packages for global nuget + inputs: + command: restore + feedsToUse: config + configPath: NuGet.config + restoreSolution: dep/nuget/packages.config + restoreDirectory: '$(Build.SourcesDirectory)\packages' + - task: VSBuild@1 displayName: 'Build solution **\OpenConsole.sln' inputs: diff --git a/build/pipelines/templates/build-console-compliance-job.yml b/build/pipelines/templates/build-console-compliance-job.yml index eafaf6b8062..3ae3fb197ee 100644 --- a/build/pipelines/templates/build-console-compliance-job.yml +++ b/build/pipelines/templates/build-console-compliance-job.yml @@ -52,6 +52,14 @@ jobs: selectOrConfig: config nugetConfigPath: NuGet.Config arguments: restore OpenConsole.sln -SolutionDirectory $(Build.SourcesDirectory) + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: Restore NuGet packages for global nuget + inputs: + command: restore + feedsToUse: config + configPath: NuGet.config + restoreSolution: dep/nuget/packages.config + restoreDirectory: '$(Build.SourcesDirectory)\packages' - task: UniversalPackages@0 displayName: Download terminal-internal Universal Package inputs: diff --git a/build/pipelines/templates/build-console-steps.yml b/build/pipelines/templates/build-console-steps.yml index dd609988604..65e1d146aa3 100644 --- a/build/pipelines/templates/build-console-steps.yml +++ b/build/pipelines/templates/build-console-steps.yml @@ -34,6 +34,15 @@ steps: restoreSolution: OpenConsole.sln restoreDirectory: '$(Build.SourcesDirectory)\packages' +- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: Restore NuGet packages for global nuget + inputs: + command: restore + feedsToUse: config + configPath: NuGet.config + restoreSolution: dep/nuget/packages.config + restoreDirectory: '$(Build.SourcesDirectory)\packages' + # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves. - script: | "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt diff --git a/dep/nuget/packages.config b/dep/nuget/packages.config new file mode 100644 index 00000000000..fb81204984e --- /dev/null +++ b/dep/nuget/packages.config @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj index dab7c2bf390..ca276b2b13f 100644 --- a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj +++ b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -40,4 +41,5 @@ + diff --git a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj index 2ad3e5508e3..47214270725 100644 --- a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj @@ -19,9 +19,11 @@ SettingsModel.LocalTests DynamicLibrary true + + @@ -94,6 +96,7 @@ + @@ -102,7 +105,7 @@ <_MUXBinRoot>"$(OpenConsoleDir)packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\runtimes\win10-$(Native-Platform)\native\" - + diff --git a/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp b/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp index 4d0f6603103..7a92e2c023c 100644 --- a/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp +++ b/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "../TerminalApp/CommandLinePaletteItem.h" #include "../TerminalApp/CommandPalette.h" -#include "../CppWinrtTailored.h" +#include "CppWinrtTailored.h" using namespace Microsoft::Console; using namespace WEX::Logging; diff --git a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp index 424f0ddcdc0..fcb8f214de0 100644 --- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp +++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp @@ -9,7 +9,7 @@ #include "../TerminalApp/ShortcutActionDispatch.h" #include "../TerminalApp/TerminalTab.h" #include "../TerminalApp/CommandPalette.h" -#include "../CppWinrtTailored.h" +#include "CppWinrtTailored.h" using namespace Microsoft::Console; using namespace TerminalApp; diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj index d44431a5f89..b57c9beb56a 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj @@ -21,7 +21,13 @@ true + + + true + + + @@ -87,6 +93,7 @@ + @@ -97,6 +104,5 @@ - diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj index 896547f5ffd..81a175840f5 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj @@ -29,6 +29,7 @@ + @@ -127,6 +128,7 @@ + diff --git a/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj b/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj index 517c2f56fcb..638229df0d4 100644 --- a/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj +++ b/src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj @@ -9,8 +9,10 @@ StaticLibrary Console true + true + @@ -107,7 +109,6 @@ - @@ -139,5 +140,8 @@ + + + - \ No newline at end of file + diff --git a/src/cascadia/Remoting/dll/Microsoft.Terminal.Remoting.vcxproj b/src/cascadia/Remoting/dll/Microsoft.Terminal.Remoting.vcxproj index a2eaba668e4..d0b9179f433 100644 --- a/src/cascadia/Remoting/dll/Microsoft.Terminal.Remoting.vcxproj +++ b/src/cascadia/Remoting/dll/Microsoft.Terminal.Remoting.vcxproj @@ -12,7 +12,11 @@ true true + + true + + @@ -71,4 +75,7 @@ + + + diff --git a/src/cascadia/Remoting/packages.config b/src/cascadia/Remoting/packages.config deleted file mode 100644 index 64e09e4c8e5..00000000000 --- a/src/cascadia/Remoting/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj b/src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj index ad10da07a77..2f6fce0cb92 100644 --- a/src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj +++ b/src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj @@ -11,7 +11,11 @@ false + + true + + @@ -30,7 +34,6 @@ - @@ -50,6 +53,7 @@ + + + + - 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}. - - @@ -88,15 +92,12 @@ - - 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}. - @@ -111,4 +112,7 @@ + + + diff --git a/src/cascadia/TerminalApp/packages.config b/src/cascadia/TerminalApp/packages.config index e039fa4ae47..e91b14a32bf 100644 --- a/src/cascadia/TerminalApp/packages.config +++ b/src/cascadia/TerminalApp/packages.config @@ -1,7 +1,4 @@ - - - diff --git a/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj b/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj index cf465a2a340..0fddd2db19a 100644 --- a/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj +++ b/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj @@ -13,7 +13,12 @@ Windows + + true + + + @@ -33,9 +38,6 @@ - - - @@ -57,6 +59,7 @@ + diff --git a/src/cascadia/TerminalAzBridge/packages.config b/src/cascadia/TerminalAzBridge/packages.config deleted file mode 100644 index 6ec12ca23d1..00000000000 --- a/src/cascadia/TerminalAzBridge/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj index f9ab61577f7..0fed7d60aa1 100644 --- a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj +++ b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj @@ -9,7 +9,12 @@ true true + + true + true + + @@ -60,7 +65,6 @@ Designer - @@ -81,13 +85,6 @@ - - - - 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}. - - - $(IntDir)..\OpenConsoleProxy;%(AdditionalIncludeDirectories) @@ -98,6 +95,9 @@ + + + @@ -140,7 +146,6 @@ - @@ -175,5 +180,8 @@ + + + diff --git a/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj b/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj index 061b74c23f2..7783493136c 100644 --- a/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj +++ b/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj @@ -22,7 +22,13 @@ --> 3 + + + true + + + @@ -98,4 +104,7 @@ + + + diff --git a/src/cascadia/TerminalControl/packages.config b/src/cascadia/TerminalControl/packages.config deleted file mode 100644 index 64e09e4c8e5..00000000000 --- a/src/cascadia/TerminalControl/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj index 2f750978bba..7488acf941f 100644 --- a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj +++ b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj @@ -12,12 +12,17 @@ true + + true + + "$(SolutionDir)\src\cascadia\TerminalCore\Generated Files\winrt";$(SolutionDir)src\cascadia\TerminalCore;$(CAExcludePath) + @@ -65,4 +70,7 @@ + + + diff --git a/src/cascadia/TerminalCore/packages.config b/src/cascadia/TerminalCore/packages.config deleted file mode 100644 index 6ec12ca23d1..00000000000 --- a/src/cascadia/TerminalCore/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj index 7c5f17695a9..8953d1e9b2a 100644 --- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj +++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj @@ -32,7 +32,11 @@ 4 nested + + true + + @@ -345,6 +349,10 @@ + + + + @@ -353,4 +361,4 @@ - \ No newline at end of file + diff --git a/src/cascadia/TerminalSettingsEditor/packages.config b/src/cascadia/TerminalSettingsEditor/packages.config index 9b938bd8686..03d6e483c32 100644 --- a/src/cascadia/TerminalSettingsEditor/packages.config +++ b/src/cascadia/TerminalSettingsEditor/packages.config @@ -1,6 +1,4 @@ - - diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj index bf0e68e2662..c37026831c5 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj @@ -10,7 +10,12 @@ Console true + + true + true + + @@ -184,7 +189,6 @@ - @@ -268,13 +272,14 @@ + + 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}. - @@ -125,4 +129,7 @@ + + + diff --git a/src/cascadia/TerminalSettingsModel/packages.config b/src/cascadia/TerminalSettingsModel/packages.config deleted file mode 100644 index 2ecd2492264..00000000000 --- a/src/cascadia/TerminalSettingsModel/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj b/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj index 08cc065238c..b553e3f9ccc 100644 --- a/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj +++ b/src/cascadia/UnitTests_Control/Control.UnitTests.vcxproj @@ -10,7 +10,12 @@ true + + true + + + @@ -85,5 +90,7 @@ + + diff --git a/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj index 424e6f9b4b7..171b3eed2d5 100644 --- a/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj +++ b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj @@ -19,9 +19,11 @@ Remoting.Unit.Tests DynamicLibrary true + + @@ -71,6 +73,6 @@ - + diff --git a/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj b/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj index 0bcdc582a67..42893d18fa4 100644 --- a/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj +++ b/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj @@ -9,7 +9,11 @@ DynamicLibrary false + + true + + @@ -98,4 +102,8 @@ + + + + diff --git a/src/cascadia/WinRTUtils/WinRTUtils.vcxproj b/src/cascadia/WinRTUtils/WinRTUtils.vcxproj index 0c6d74a8ac8..ac766d765fe 100644 --- a/src/cascadia/WinRTUtils/WinRTUtils.vcxproj +++ b/src/cascadia/WinRTUtils/WinRTUtils.vcxproj @@ -10,7 +10,11 @@ Console true + + true + + @@ -33,10 +37,6 @@ - - - - @@ -50,4 +50,5 @@ + diff --git a/src/cascadia/WinRTUtils/packages.config b/src/cascadia/WinRTUtils/packages.config deleted file mode 100644 index 6ec12ca23d1..00000000000 --- a/src/cascadia/WinRTUtils/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index 47655445e79..e4e6186e799 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -1,6 +1,5 @@ - {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} @@ -17,7 +16,15 @@ true + + true + true + true + true + + + @@ -135,17 +142,11 @@ - - 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/common.build.post.props b/src/common.build.post.props index 399cec3bf1e..4e2a1f7d086 100644 --- a/src/common.build.post.props +++ b/src/common.build.post.props @@ -33,8 +33,6 @@ - - diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 4d494f911ab..b8178508228 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -181,7 +181,6 @@ - diff --git a/src/common.build.tests.props b/src/common.build.tests.props index 3e43e16fe81..0c93e53ed75 100644 --- a/src/common.build.tests.props +++ b/src/common.build.tests.props @@ -5,11 +5,7 @@ INLINE_TEST_METHOD_MARKUP;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}. - - - + + true + diff --git a/src/common.nugetversions.props b/src/common.nugetversions.props new file mode 100644 index 00000000000..170b9062dcb --- /dev/null +++ b/src/common.nugetversions.props @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + $(MSBuildThisFileDirectory)..\packages\Microsoft.Taef.10.60.210621002 + + + + + $(MSBuildThisFileDirectory)..\packages\Appium.WebDriver.3.0.0.2 + + + + + $(MSBuildThisFileDirectory)..\packages\Castle.Core.4.1.1 + + + + + $(MSBuildThisFileDirectory)..\packages\Newtonsoft.Json.12.0.3 + + + + + $(MSBuildThisFileDirectory)..\packages\Selenium.WebDriver.3.5.0 + + + + + $(MSBuildThisFileDirectory)..\packages\Selenium.Support.3.5.0 + + + diff --git a/src/common.nugetversions.targets b/src/common.nugetversions.targets new file mode 100644 index 00000000000..025d7418948 --- /dev/null +++ b/src/common.nugetversions.targets @@ -0,0 +1,97 @@ + + + + + + + + + $(SolutionDir)dep\nuget\nuget.exe + $(SolutionDir)dep\nuget\packages.config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/cppwinrt.build.post.props b/src/cppwinrt.build.post.props index 72d925f0b13..68fc7ec2616 100644 --- a/src/cppwinrt.build.post.props +++ b/src/cppwinrt.build.post.props @@ -1,15 +1,4 @@ - - - - - - - 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/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props index 263da4fd9bf..30a659e33c4 100644 --- a/src/cppwinrt.build.pre.props +++ b/src/cppwinrt.build.pre.props @@ -8,8 +8,6 @@ - - AnyValueHereWillDisableTheOptOut true diff --git a/src/host/exe/packages.config b/src/host/exe/packages.config deleted file mode 100644 index 9e477b65215..00000000000 --- a/src/host/exe/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/host/ft_host/Host.FeatureTests.vcxproj b/src/host/ft_host/Host.FeatureTests.vcxproj index 1538e9b5455..6f782a5404e 100644 --- a/src/host/ft_host/Host.FeatureTests.vcxproj +++ b/src/host/ft_host/Host.FeatureTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -60,4 +61,5 @@ + diff --git a/src/host/ft_uia/Host.Tests.UIA.csproj b/src/host/ft_uia/Host.Tests.UIA.csproj index 1f71e6a4919..675ddd7086a 100644 --- a/src/host/ft_uia/Host.Tests.UIA.csproj +++ b/src/host/ft_uia/Host.Tests.UIA.csproj @@ -21,6 +21,10 @@ + + true + + ARM64 @@ -43,35 +47,35 @@ - ..\..\..\packages\Appium.WebDriver.3.0.0.2\lib\net45\appium-dotnet-driver.dll + $(AppiumWebDriverPathRoot)\lib\net45\appium-dotnet-driver.dll - ..\..\..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll + $(CastleCorePathRoot)\lib\net45\Castle.Core.dll - ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + $(NewtonsoftJSONPathRoot)\lib\net45\Newtonsoft.Json.dll - ..\..\..\packages\Microsoft.Taef.10.60.210621002\lib\net45\TE.Managed.dll + $(TAEFPackagePathRoot)\lib\net45\TE.Managed.dll - ..\..\..\packages\Microsoft.Taef.10.60.210621002\lib\net45\TE.Model.Managed.dll + $(TAEFPackagePathRoot)\lib\net45\TE.Model.Managed.dll - ..\..\..\packages\Selenium.WebDriver.3.5.0\lib\net40\WebDriver.dll + $(SeleniumWebDriverPathRoot)\lib\net40\WebDriver.dll - ..\..\..\packages\Selenium.Support.3.5.0\lib\net40\WebDriver.Support.dll + $(SeleniumSupportPathRoot)\lib\net40\WebDriver.Support.dll - ..\..\..\packages\Microsoft.Taef.10.60.210621002\lib\net45\Wex.Common.Managed.dll + $(TAEFPackagePathRoot)\lib\net45\Wex.Common.Managed.dll - ..\..\..\packages\Microsoft.Taef.10.60.210621002\lib\net45\Wex.Logger.Interop.dll + $(TAEFPackagePathRoot)\lib\net45\Wex.Logger.Interop.dll @@ -121,7 +125,6 @@ - @@ -148,11 +151,5 @@ 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 deleted file mode 100644 index 0579ab06c6a..00000000000 --- a/src/host/ft_uia/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/host/ut_host/Host.UnitTests.vcxproj b/src/host/ut_host/Host.UnitTests.vcxproj index 6b5bedf1b11..633c990e6fa 100644 --- a/src/host/ut_host/Host.UnitTests.vcxproj +++ b/src/host/ut_host/Host.UnitTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -112,4 +113,5 @@ + diff --git a/src/host/ut_lib/host.unittest.vcxproj b/src/host/ut_lib/host.unittest.vcxproj index 75821ebc8a8..3faad5afefe 100644 --- a/src/host/ut_lib/host.unittest.vcxproj +++ b/src/host/ut_lib/host.unittest.vcxproj @@ -6,9 +6,10 @@ hostlib.unittest Host.unittest ConhostV2Lib.unittest - StaticLibrary + StaticLibrary + @@ -19,4 +20,5 @@ + diff --git a/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj b/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj index fa2fa30b086..5a03a6df2d3 100644 --- a/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj +++ b/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -79,4 +80,5 @@ + diff --git a/src/renderer/dx/ut_dx/Dx.Unit.Tests.vcxproj b/src/renderer/dx/ut_dx/Dx.Unit.Tests.vcxproj index 78b8de06872..4c6abb8075e 100644 --- a/src/renderer/dx/ut_dx/Dx.Unit.Tests.vcxproj +++ b/src/renderer/dx/ut_dx/Dx.Unit.Tests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -37,4 +38,5 @@ - \ No newline at end of file + + diff --git a/src/renderer/vt/ut_lib/vt.unittest.vcxproj b/src/renderer/vt/ut_lib/vt.unittest.vcxproj index 2c146516195..9f33a67e60d 100644 --- a/src/renderer/vt/ut_lib/vt.unittest.vcxproj +++ b/src/renderer/vt/ut_lib/vt.unittest.vcxproj @@ -9,9 +9,11 @@ StaticLibrary + + diff --git a/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj b/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj index b1ce6a9d73e..8ee87c5ba50 100644 --- a/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj +++ b/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -45,4 +46,5 @@ + diff --git a/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj b/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj index 906822e1e2d..587d6ed1d1e 100644 --- a/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj +++ b/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj @@ -9,6 +9,7 @@ Application + Create @@ -34,4 +35,5 @@ + diff --git a/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj b/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj index f9b51f59f2f..98b4a98515b 100644 --- a/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj +++ b/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj @@ -9,6 +9,7 @@ Application + Create @@ -39,4 +40,5 @@ - \ No newline at end of file + + diff --git a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj index 549eb4170ff..6ddbcdd116b 100644 --- a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj +++ b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -42,10 +43,8 @@ {06ec74cb-9a12-429c-b551-8562ec964846} - - - + diff --git a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj.filters b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj.filters index 888240512c2..61ed48e9af8 100644 --- a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj.filters +++ b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj.filters @@ -39,7 +39,4 @@ - - - \ No newline at end of file diff --git a/src/terminal/parser/ut_parser/packages.config b/src/terminal/parser/ut_parser/packages.config deleted file mode 100644 index bd5fb454237..00000000000 --- a/src/terminal/parser/ut_parser/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/til/ut_til/til.unit.tests.vcxproj b/src/til/ut_til/til.unit.tests.vcxproj index 48f9a8d3dea..ac5fa9bebb4 100644 --- a/src/til/ut_til/til.unit.tests.vcxproj +++ b/src/til/ut_til/til.unit.tests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + Create @@ -44,4 +45,5 @@ + diff --git a/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj b/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj index 0daaf4a3d0e..1e4815a9cfe 100644 --- a/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj +++ b/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj @@ -13,7 +13,12 @@ Windows + + true + + + @@ -54,10 +59,6 @@ - - - - @@ -87,5 +88,8 @@ + + + diff --git a/src/tools/MonarchPeasantSample/packages.config b/src/tools/MonarchPeasantSample/packages.config deleted file mode 100644 index 21e62883af7..00000000000 --- a/src/tools/MonarchPeasantSample/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/types/ut_types/Types.Unit.Tests.vcxproj b/src/types/ut_types/Types.Unit.Tests.vcxproj index 3f5087de763..dfd180e294e 100644 --- a/src/types/ut_types/Types.Unit.Tests.vcxproj +++ b/src/types/ut_types/Types.Unit.Tests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -32,4 +33,5 @@ + diff --git a/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj b/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj index 438f6014dae..503ff27408b 100644 --- a/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj +++ b/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj @@ -9,6 +9,7 @@ DynamicLibrary + @@ -31,6 +32,7 @@ + $(OutDir)\conptylib.lib;%(AdditionalDependencies) diff --git a/tools/OpenConsole.psm1 b/tools/OpenConsole.psm1 index bad0afb0d95..fd0ededc112 100644 --- a/tools/OpenConsole.psm1 +++ b/tools/OpenConsole.psm1 @@ -261,6 +261,7 @@ function Invoke-OpenConsoleBuild() { $root = Find-OpenConsoleRoot & "$root\dep\nuget\nuget.exe" restore "$root\OpenConsole.sln" + & "$root\dep\nuget\nuget.exe" restore "$root\dep\nuget\packages.config" msbuild.exe "$root\OpenConsole.sln" @args } diff --git a/tools/razzle.cmd b/tools/razzle.cmd index 456e271d1b2..f5b567d77f0 100644 --- a/tools/razzle.cmd +++ b/tools/razzle.cmd @@ -22,6 +22,7 @@ set PATH=%PATH%%OPENCON%\dep\nuget; rem Run nuget restore so you can use vswhere nuget restore %OPENCON%\OpenConsole.sln -Verbosity quiet +nuget restore %OPENCON%\dep\nuget\packages.config -Verbosity quiet :FIND_MSBUILD set MSBUILD=