DotNetTools 269 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373
  1. commit 1f3f010f873f22bfdaa23d6855ad3750a4058dfc
  2. Author: Nate McMaster <[email protected]>
  3. Date: Tue Dec 12 14:37:42 2017 -0800
  4. Upgrade CLI tools to .NET Core 2.1
  5. diff --git a/Directory.Build.props b/Directory.Build.props
  6. index 29ae42a346f..1afa691c5fe 100644
  7. --- a/Directory.Build.props
  8. +++ b/Directory.Build.props
  9. @@ -1,4 +1,8 @@
  10. <Project>
  11. + <Import
  12. + Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
  13. + Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
  14. +
  15. <Import Project="version.props" />
  16. <Import Project="build\dependencies.props" />
  17. <Import Project="build\sources.props" />
  18. diff --git a/Directory.Build.targets b/Directory.Build.targets
  19. index 894b1d0cf88..c3d61be3b4c 100644
  20. --- a/Directory.Build.targets
  21. +++ b/Directory.Build.targets
  22. @@ -1,6 +1,5 @@
  23. <Project>
  24. <PropertyGroup>
  25. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
  26. <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
  27. </PropertyGroup>
  28. </Project>
  29. diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
  30. index c279df4745d..6979dfba80b 100644
  31. --- a/NuGetPackageVerifier.json
  32. +++ b/NuGetPackageVerifier.json
  33. @@ -27,7 +27,7 @@
  34. "Microsoft.AspNetCore.DeveloperCertificates.XPlat": {
  35. "Exclusions": {
  36. "DOC_MISSING": {
  37. - "lib/netcoreapp2.0/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll": "Enter justification"
  38. + "lib/netcoreapp2.1/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll": "Docs not required to shipoob package"
  39. }
  40. }
  41. }
  42. diff --git a/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj b/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
  43. index 39dea69c5f3..96438bfa811 100644
  44. --- a/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
  45. +++ b/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
  46. @@ -1,6 +1,6 @@
  47. <Project Sdk="Microsoft.NET.Sdk">
  48. <PropertyGroup>
  49. - <TargetFramework>netcoreapp2.0</TargetFramework>
  50. + <TargetFramework>netcoreapp2.1</TargetFramework>
  51. </PropertyGroup>
  52. <ItemGroup>
  53. diff --git a/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj b/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
  54. index f45eb26ccf7..65fd51d8d71 100755
  55. --- a/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
  56. +++ b/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
  57. @@ -1,7 +1,7 @@
  58. <Project Sdk="Microsoft.NET.Sdk.Web">
  59. <PropertyGroup>
  60. - <TargetFramework>netcoreapp2.0</TargetFramework>
  61. + <TargetFramework>netcoreapp2.1</TargetFramework>
  62. </PropertyGroup>
  63. <ItemGroup>
  64. diff --git a/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj b/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj
  65. index 694a96f3f95..0ffd10766a7 100755
  66. --- a/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj
  67. +++ b/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj
  68. @@ -1,7 +1,7 @@
  69. <Project Sdk="Microsoft.NET.Sdk">
  70. <PropertyGroup>
  71. - <TargetFramework>netcoreapp2.0</TargetFramework>
  72. + <TargetFramework>netcoreapp2.1</TargetFramework>
  73. </PropertyGroup>
  74. <ItemGroup>
  75. diff --git a/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj b/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj
  76. index 0bc2f3e71b0..ec2a93ed3aa 100755
  77. --- a/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj
  78. +++ b/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj
  79. @@ -1,7 +1,7 @@
  80. <Project Sdk="Microsoft.NET.Sdk.Web">
  81. <PropertyGroup>
  82. - <TargetFramework>netcoreapp2.0</TargetFramework>
  83. + <TargetFramework>netcoreapp2.1</TargetFramework>
  84. </PropertyGroup>
  85. <ItemGroup>
  86. diff --git a/samples/dotnet-watch/WatchMultipleProjects/watch.csproj b/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
  87. index d34686cbbce..b0ab41a5394 100644
  88. --- a/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
  89. +++ b/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
  90. @@ -1,6 +1,6 @@
  91. <Project Sdk="Microsoft.NET.Sdk">
  92. <PropertyGroup>
  93. - <TargetFramework>netcoreapp2.0</TargetFramework>
  94. + <TargetFramework>netcoreapp2.1</TargetFramework>
  95. <EnableDefaultItems>false</EnableDefaultItems>
  96. </PropertyGroup>
  97. diff --git a/src/Microsoft.AspNetCore.DeveloperCertificates.Tools/Microsoft.AspNetCore.DeveloperCertificates.Tools.csproj b/src/Microsoft.AspNetCore.DeveloperCertificates.Tools/Microsoft.AspNetCore.DeveloperCertificates.Tools.csproj
  98. index 36ba69485ea..c2fd9283f10 100644
  99. --- a/src/Microsoft.AspNetCore.DeveloperCertificates.Tools/Microsoft.AspNetCore.DeveloperCertificates.Tools.csproj
  100. +++ b/src/Microsoft.AspNetCore.DeveloperCertificates.Tools/Microsoft.AspNetCore.DeveloperCertificates.Tools.csproj
  101. @@ -1,7 +1,7 @@
  102. <Project Sdk="Microsoft.NET.Sdk">
  103. <PropertyGroup>
  104. - <TargetFramework>netcoreapp2.0</TargetFramework>
  105. + <TargetFramework>netcoreapp2.1</TargetFramework>
  106. <AssemblyName>dotnet-developercertificates</AssemblyName>
  107. <OutputType>exe</OutputType>
  108. <Description>Command line tool to generate certificates used in ASP.NET Core during development.</Description>
  109. diff --git a/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj b/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
  110. index 04bf6946c9c..81c90a297cc 100644
  111. --- a/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
  112. +++ b/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
  113. @@ -1,11 +1,10 @@
  114. <Project Sdk="Microsoft.NET.Sdk">
  115. <PropertyGroup>
  116. - <TargetFramework>netcoreapp2.0</TargetFramework>
  117. + <TargetFramework>netcoreapp2.1</TargetFramework>
  118. <Description>Package for the CLI first run experience.</Description>
  119. <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
  120. <PackageTags>aspnet;cli</PackageTags>
  121. - <GenerateDocumentationFile>false</GenerateDocumentationFile>
  122. </PropertyGroup>
  123. <ItemGroup>
  124. diff --git a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
  125. index 294943581a7..5c79f6f652d 100644
  126. --- a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
  127. +++ b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
  128. @@ -1,7 +1,7 @@
  129. <Project Sdk="Microsoft.NET.Sdk">
  130. <PropertyGroup>
  131. - <TargetFramework>netcoreapp2.0</TargetFramework>
  132. + <TargetFramework>netcoreapp2.1</TargetFramework>
  133. <AssemblyName>dotnet-watch</AssemblyName>
  134. <OutputType>exe</OutputType>
  135. <Description>Command line tool to watch for source file changes during development and restart the dotnet command.</Description>
  136. diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
  137. index f8ea1559869..d3ce82febea 100644
  138. --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
  139. +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
  140. @@ -1,7 +1,7 @@
  141. <Project Sdk="Microsoft.NET.Sdk">
  142. <PropertyGroup>
  143. - <TargetFramework>netcoreapp2.0</TargetFramework>
  144. + <TargetFramework>netcoreapp2.1</TargetFramework>
  145. <AssemblyName>dotnet-sql-cache</AssemblyName>
  146. <OutputType>exe</OutputType>
  147. <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
  148. diff --git a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
  149. index 3dc0507021e..ef8adb296fd 100644
  150. --- a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
  151. +++ b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
  152. @@ -1,7 +1,7 @@
  153. <Project Sdk="Microsoft.NET.Sdk">
  154. <PropertyGroup>
  155. - <TargetFramework>netcoreapp2.0</TargetFramework>
  156. + <TargetFramework>netcoreapp2.1</TargetFramework>
  157. <AssemblyName>dotnet-user-secrets</AssemblyName>
  158. <OutputType>exe</OutputType>
  159. <Description>Command line tool to manage user secrets for Microsoft.Extensions.Configuration.</Description>
  160. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
  161. index 4df16166a01..9f1cc132bc2 100644
  162. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
  163. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
  164. @@ -292,16 +292,16 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
  165. {
  166. changedEv.Set();
  167. }
  168. - catch(ObjectDisposedException)
  169. + catch (ObjectDisposedException)
  170. {
  171. // There's a known race condition here:
  172. // even though we tell the watcher to stop raising events and we unsubscribe the handler
  173. - // there might be in-flight events that will still process. Since we dispose the reset
  174. + // there might be in-flight events that will still process. Since we dispose the reset
  175. // event, this code will fail if the handler executes after Dispose happens. There's no
  176. // better way to guard against it than catch because we cannot check if the object is
  177. // disposed nor can we check if there are any in-flight events.
  178. // This is actually a known issue in the corefx file watcher. It can trigger multiple
  179. - // times for the same item.
  180. + // times for the same item.
  181. }
  182. };
  183. @@ -316,8 +316,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
  184. var testFileFullPath = Path.Combine(dir, "foo1");
  185. File.WriteAllText(testFileFullPath, string.Empty);
  186. Assert.True(changedEv.WaitOne(DefaultTimeout));
  187. - Assert.Equal(testFileFullPath, filesChanged.Single());
  188. + var fileChanged = Assert.Single(filesChanged);
  189. + Assert.Equal(testFileFullPath, fileChanged);
  190. filesChanged.Clear();
  191. + changedEv.Reset();
  192. // On Unix the file write time is in 1s increments;
  193. // if we don't wait, there's a chance that the polling
  194. @@ -327,8 +329,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
  195. testFileFullPath = Path.Combine(dir, "foo2");
  196. File.WriteAllText(testFileFullPath, string.Empty);
  197. Assert.True(changedEv.WaitOne(DefaultTimeout));
  198. - Assert.Equal(testFileFullPath, filesChanged.Single());
  199. + fileChanged = Assert.Single(filesChanged);
  200. + Assert.Equal(testFileFullPath, fileChanged);
  201. filesChanged.Clear();
  202. + changedEv.Reset();
  203. // On Unix the file write time is in 1s increments;
  204. // if we don't wait, there's a chance that the polling
  205. @@ -340,6 +344,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
  206. Assert.True(changedEv.WaitOne(DefaultTimeout));
  207. Assert.Equal(testFileFullPath, filesChanged.Single());
  208. filesChanged.Clear();
  209. + changedEv.Reset();
  210. // On Unix the file write time is in 1s increments;
  211. // if we don't wait, there's a chance that the polling
  212. @@ -348,7 +353,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
  213. File.WriteAllText(testFileFullPath, string.Empty);
  214. Assert.True(changedEv.WaitOne(DefaultTimeout));
  215. - Assert.Equal(testFileFullPath, filesChanged.Single());
  216. + fileChanged = Assert.Single(filesChanged);
  217. + Assert.Equal(testFileFullPath, fileChanged);
  218. watcher.EnableRaisingEvents = false;
  219. watcher.OnFileChange -= handler;
  220. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
  221. index 8d2c4713c8f..06434ae064a 100644
  222. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
  223. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
  224. @@ -1,7 +1,7 @@
  225. <Project Sdk="Microsoft.NET.Sdk">
  226. <PropertyGroup>
  227. - <TargetFramework>netcoreapp2.0</TargetFramework>
  228. + <TargetFramework>netcoreapp2.1</TargetFramework>
  229. <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
  230. </PropertyGroup>
  231. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
  232. index 3a4f75ddc6a..76d74464528 100644
  233. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
  234. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
  235. @@ -1,7 +1,7 @@
  236. <Project Sdk="Microsoft.NET.Sdk">
  237. <PropertyGroup>
  238. - <TargetFramework>netcoreapp2.0</TargetFramework>
  239. + <TargetFramework>netcoreapp2.1</TargetFramework>
  240. <OutputType>exe</OutputType>
  241. </PropertyGroup>
  242. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
  243. index d18211405ee..60645a49dad 100644
  244. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
  245. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
  246. @@ -1,7 +1,7 @@
  247. <Project Sdk="Microsoft.NET.Sdk">
  248. <PropertyGroup>
  249. - <TargetFramework>netcoreapp2.0</TargetFramework>
  250. + <TargetFramework>netcoreapp2.1</TargetFramework>
  251. <OutputType>exe</OutputType>
  252. <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  253. </PropertyGroup>
  254. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj
  255. index aeb186ac39a..699071e138c 100755
  256. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj
  257. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj
  258. @@ -9,7 +9,7 @@
  259. <PropertyGroup>
  260. <OutputType>Exe</OutputType>
  261. - <TargetFramework>netcoreapp2.0</TargetFramework>
  262. + <TargetFramework>netcoreapp2.1</TargetFramework>
  263. </PropertyGroup>
  264. <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
  265. diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
  266. index 161a1c9290e..86e88b8b958 100644
  267. --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
  268. +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
  269. @@ -1,7 +1,7 @@
  270. <Project Sdk="Microsoft.NET.Sdk">
  271. <PropertyGroup>
  272. - <TargetFramework>netcoreapp2.0</TargetFramework>
  273. + <TargetFramework>netcoreapp2.1</TargetFramework>
  274. <OutputType>exe</OutputType>
  275. </PropertyGroup>
  276. diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj b/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
  277. index c005f40d88c..0ace1e9148f 100644
  278. --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
  279. +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
  280. @@ -1,7 +1,7 @@
  281. <Project Sdk="Microsoft.NET.Sdk">
  282. <PropertyGroup>
  283. - <TargetFramework>netcoreapp2.0</TargetFramework>
  284. + <TargetFramework>netcoreapp2.1</TargetFramework>
  285. </PropertyGroup>
  286. <ItemGroup>
  287. diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/MsBuildFileSetFactoryTest.cs b/test/Microsoft.DotNet.Watcher.Tools.Tests/MsBuildFileSetFactoryTest.cs
  288. index dde03d31ab0..572b021f800 100644
  289. --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/MsBuildFileSetFactoryTest.cs
  290. +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/MsBuildFileSetFactoryTest.cs
  291. @@ -6,6 +6,7 @@ using System.Linq;
  292. using System.Text.RegularExpressions;
  293. using System.Threading;
  294. using System.Threading.Tasks;
  295. +using Microsoft.AspNetCore.Testing;
  296. using Microsoft.DotNet.Watcher.Internal;
  297. using Microsoft.Extensions.Tools.Internal;
  298. using Xunit;
  299. @@ -274,12 +275,9 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
  300. private async Task<IFileSet> GetFileSet(MsBuildFileSetFactory filesetFactory)
  301. {
  302. _tempDir.Create();
  303. - var createTask = filesetFactory.CreateAsync(CancellationToken.None);
  304. - var finished = await Task.WhenAny(createTask, Task.Delay(TimeSpan.FromSeconds(10)));
  305. -
  306. - Assert.Same(createTask, finished);
  307. - Assert.NotNull(createTask.Result);
  308. - return createTask.Result;
  309. + return await filesetFactory
  310. + .CreateAsync(CancellationToken.None)
  311. + .TimeoutAfter(TimeSpan.FromSeconds(30));
  312. }
  313. public void Dispose()
  314. diff --git a/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj b/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
  315. index 67ace090c07..cd5d68d140a 100644
  316. --- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
  317. +++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
  318. @@ -1,7 +1,7 @@
  319. <Project Sdk="Microsoft.NET.Sdk">
  320. <PropertyGroup>
  321. - <TargetFramework>netcoreapp2.0</TargetFramework>
  322. + <TargetFramework>netcoreapp2.1</TargetFramework>
  323. </PropertyGroup>
  324. <ItemGroup>
  325. diff --git a/test/Microsoft.Extensions.SecretManager.Tools.Tests/UserSecretsTestFixture.cs b/test/Microsoft.Extensions.SecretManager.Tools.Tests/UserSecretsTestFixture.cs
  326. index 36a9e524ae4..14e62805bca 100644
  327. --- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/UserSecretsTestFixture.cs
  328. +++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/UserSecretsTestFixture.cs
  329. @@ -35,7 +35,7 @@ namespace Microsoft.Extensions.Configuration.UserSecrets.Tests
  330. private const string ProjectTemplate = @"<Project ToolsVersion=""15.0"" Sdk=""Microsoft.NET.Sdk"">
  331. <PropertyGroup>
  332. <OutputType>Exe</OutputType>
  333. - <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
  334. + <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
  335. {0}
  336. <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  337. </PropertyGroup>