Skip to content

Commit

Permalink
Updated TestPlatfom version to 16.9.0-preview-20201115-01
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haplois
Haplois committed Nov 16, 2020
1 parent e8555e8 commit 6cb2939
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 19 deletions.
11 changes: 8 additions & 3 deletions Nuget.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />

<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
<add key="vstest.myget" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
<add key="mstest.myget" value="https://dotnet.myget.org/F/mstestv2/api/v3/index.json" />


<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />


<add key="pdb2pdb.myget" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />

<add key="vsunittesting.myget" value="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json" />
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
<add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
Expand All @@ -25,5 +27,8 @@
<!-- This path is relative as a workaround to https://github.com/NuGet/Home/issues/2831 -->
<!-- <add key="globalPackagesFolder" value="packages" /> -->
<add key="repositoryPath" value="packages" />

<!-- This is a workaround for Azure Artifacts, see: https://github.com/dotnet/arcade/issues/4190, https://github.com/dotnet/core-eng/issues/9681 -->
<add key='maxHttpRequestsPerSource' value='2' />
</config>
</configuration>
2 changes: 1 addition & 1 deletion scripts/build/TestFx.Versions.targets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.9.0-preview-20201107-01</TestPlatformVersion>
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.9.0-preview-20201115-01</TestPlatformVersion>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion scripts/toolset/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" />
<package id="Microsoft.Internal.Dia.Interop" version="14.0.1" />
<package id="Microsoft.Internal.Dia.Interop" version="14.0.0" />
<package id="fmdev.xlftool" version="0.1.3" />
<package id="MSTest.Internal.TestFx.Localized.Documentation" version="1.0.0-build-20170420-1" />
<package id="vswhere" version="2.0.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/MSTest.CoreAdapter/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Desktop/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net451" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net45" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net45" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Interface/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Portable/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.TestAdapter.Dotnet.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<file src="PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="lib\net451\" />

<!-- Added the below so source navigation works in dotnet-test scenarios -->
<file src="$packagesroot$\Microsoft.Internal.Dia.Interop.14.0.1\lib\net20\msdia140typelib_clr0200.dll" target="lib\net451\" />
<file src="$packagesroot$\Microsoft.Internal.Dia.Interop.14.0.0\lib\net20\msdia140typelib_clr0200.dll" target="lib\net451\" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
Expand Down
2 changes: 1 addition & 1 deletion test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net451" />
<package id="Moq" version="4.8.2" targetFramework="net451" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net451" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net451" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/E2ETests/Automation.CLI/CLITestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class CLITestBase
private const string PackagesFolder = "packages";

// This value is automatically updated by "build.ps1" script.
private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.0-preview-20201107-01";
private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.0-preview-20201115-01";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";

private static VsTestConsoleWrapper vsTestConsoleWrapper;
Expand Down
6 changes: 3 additions & 3 deletions test/E2ETests/Automation.CLI/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.TestPlatform" version="16.9.0-preview-20201107-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.9.0-preview-20201107-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform" version="16.9.0-preview-20201115-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.9.0-preview-20201115-01" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net46" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net46" developmentDependency="true" />
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestPlatformVersion)" />
<PackageReference Include="System.Runtime" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "/>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net452" />
<package id="Moq" version="4.5.21" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net451" />
<package id="Moq" version="4.5.21" targetFramework="net451" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net451" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net451" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net452" />
<package id="Moq" version="4.5.21" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201107-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201115-01" targetFramework="net452" />
<package id="Moq" version="4.7.8" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down

0 comments on commit 6cb2939

Please sign in to comment.