From bd058e49eb5b831ff2a3bf97fa2f0d1be05955d5 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Fri, 26 Oct 2018 17:48:29 -0400
Subject: [PATCH] Update to 2.4.1

---
 src/xunit.runner.devices/xunit.runner.devices.csproj      | 6 +++---
 .../xunit.devices.templates.csproj                        | 8 ++++----
 test/test.xunit.pcltestlib/test.xunit.pcltestlib.csproj   | 2 +-
 .../test.xunit.runner.android.csproj                      | 2 +-
 test/test.xunit.runner.ios/test.xunit.runner.ios.csproj   | 2 +-
 test/test.xunit.runner.uwp/test.xunit.runner.uwp.csproj   | 8 +++-----
 xUnit.Devices.sln                                         | 4 +---
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/xunit.runner.devices/xunit.runner.devices.csproj b/src/xunit.runner.devices/xunit.runner.devices.csproj
index 5b2afc1..d891631 100644
--- a/src/xunit.runner.devices/xunit.runner.devices.csproj
+++ b/src/xunit.runner.devices/xunit.runner.devices.csproj
@@ -19,7 +19,7 @@
     <Company>.NET Foundation</Company>
     <Copyright>Copyright (C) .NET Foundation</Copyright>
     <NoPackageAnalysis>true</NoPackageAnalysis>
-    <XunitVersion>2.4.0</XunitVersion>
+    <XunitVersion>2.4.1</XunitVersion>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugType>embedded</DebugType>    
@@ -66,8 +66,8 @@
     <None Include="build\iOS\*.*" PackagePath="content\xamarinios10" Pack="true" />
     <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\uap10.0\*.dll" PackagePath="lib\uap10.0" Pack="true" Visible="false" />
     <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\uap10.0\*.pri" PackagePath="lib\uap10.0" Pack="true" Visible="false" />
-    <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\netstandard2.0\*.dll" PackagePath="lib\monoandroid81" Pack="true" Visible="false" />
-    <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\netstandard2.0\*.dll" PackagePath="lib\xamarinios10" Pack="true" Visible="false" />
+    <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\netstandard1.5\*.dll" PackagePath="lib\monoandroid81" Pack="true" Visible="false" />
+    <None Include="$(NuGetPackageRoot)xunit.runner.utility\$(XunitVersion)\lib\netstandard1.5\*.dll" PackagePath="lib\xamarinios10" Pack="true" Visible="false" />
   </ItemGroup>
 
   <Target Name="GetNuGetOutputGroup" DependsOnTargets="Pack" Returns="@(NuGetOutputGroupOutput)">
diff --git a/templates/xunit.devices.templates/xunit.devices.templates.csproj b/templates/xunit.devices.templates/xunit.devices.templates.csproj
index aa9e476..8b9268a 100644
--- a/templates/xunit.devices.templates/xunit.devices.templates.csproj
+++ b/templates/xunit.devices.templates/xunit.devices.templates.csproj
@@ -87,8 +87,8 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
     </ProjectReference>
-    <PackageReference Include="xunit" Version="2.4.0" PrivateAssets="all" ExcludeAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" PrivateAssets="all" ExcludeAssets="all" />
+    <PackageReference Include="xunit" Version="2.4.1" PrivateAssets="all" ExcludeAssets="all" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" ExcludeAssets="all" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
@@ -105,8 +105,8 @@
     </MSBuild>
     <ItemGroup>
       <Content Include="@(_NuPkgFiles)" IncludeInVSIX="true" VSIXSubPath="Packages" />
-      <Content Include="$(NuGetPackageRoot)xunit\2.4.0\*.nupkg" IncludeInVSIX="true" VSIXSubPath="Packages" />      
-      <Content Include="$(NuGetPackageRoot)xunit.runner.visualstudio\2.4.0\*.nupkg" IncludeInVSIX="true" VSIXSubPath="Packages" />
+      <Content Include="$(NuGetPackageRoot)xunit\2.4.1\*.nupkg" IncludeInVSIX="true" VSIXSubPath="Packages" />      
+      <Content Include="$(NuGetPackageRoot)xunit.runner.visualstudio\2.4.1\*.nupkg" IncludeInVSIX="true" VSIXSubPath="Packages" />
     </ItemGroup>
   </Target>
 
diff --git a/test/test.xunit.pcltestlib/test.xunit.pcltestlib.csproj b/test/test.xunit.pcltestlib/test.xunit.pcltestlib.csproj
index 0e61c9f..12b9a45 100644
--- a/test/test.xunit.pcltestlib/test.xunit.pcltestlib.csproj
+++ b/test/test.xunit.pcltestlib/test.xunit.pcltestlib.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
     <Content Include="test.xunit.pcltestlib.xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/test/test.xunit.runner.android/test.xunit.runner.android.csproj b/test/test.xunit.runner.android/test.xunit.runner.android.csproj
index 0d16457..d67e646 100644
--- a/test/test.xunit.runner.android/test.xunit.runner.android.csproj
+++ b/test/test.xunit.runner.android/test.xunit.runner.android.csproj
@@ -96,7 +96,7 @@
       <Project>{b7c9bebb-26c2-483b-9be8-80a8ee523eb8}</Project>
       <Name>test.xunit.pcltestlib</Name>
     </ProjectReference>
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\src\xunit.runner.devices\build\xunit.runner.devices.targets" />
diff --git a/test/test.xunit.runner.ios/test.xunit.runner.ios.csproj b/test/test.xunit.runner.ios/test.xunit.runner.ios.csproj
index d494cef..081f674 100644
--- a/test/test.xunit.runner.ios/test.xunit.runner.ios.csproj
+++ b/test/test.xunit.runner.ios/test.xunit.runner.ios.csproj
@@ -177,7 +177,7 @@
       <Project>{b7c9bebb-26c2-483b-9be8-80a8ee523eb8}</Project>
       <Name>test.xunit.pcltestlib</Name>
     </ProjectReference>
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\src\xunit.runner.devices\build\xunit.runner.devices.targets" />
diff --git a/test/test.xunit.runner.uwp/test.xunit.runner.uwp.csproj b/test/test.xunit.runner.uwp/test.xunit.runner.uwp.csproj
index 3a4a3cf..e4136e2 100644
--- a/test/test.xunit.runner.uwp/test.xunit.runner.uwp.csproj
+++ b/test/test.xunit.runner.uwp/test.xunit.runner.uwp.csproj
@@ -127,9 +127,6 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="xunit.runner.utility">
-      <Version>2.4.0</Version>
-    </PackageReference>
     <ProjectReference Include="..\..\src\xunit.runner.devices\xunit.runner.devices.csproj">
       <Project>{4c73a814-9327-4b0b-a46e-acfe47481817}</Project>
       <Name>xunit.runner.devices</Name>
@@ -141,8 +138,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.1.7</Version>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/xUnit.Devices.sln b/xUnit.Devices.sln
index b0109e7..ec19578 100644
--- a/xUnit.Devices.sln
+++ b/xUnit.Devices.sln
@@ -12,9 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{E3B9769B-D
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		.vsts-ci.yml = .vsts-ci.yml
-		.vsts-pr.yml = .vsts-pr.yml
-		.vsts-shared.yml = .vsts-shared.yml
+		azure-pipelines.yml = azure-pipelines.yml
 		Directory.build.props = Directory.build.props
 		README.md = README.md
 		version.json = version.json