From f6dfc7c953241fd55df2fba65198b3fbd34693cf Mon Sep 17 00:00:00 2001
From: Ramanuj Bhattacharjee <rambhatt@microsoft.com>
Date: Mon, 25 Oct 2021 15:14:49 -0700
Subject: [PATCH] save merge changes

---
 ...pplicationInsights.AspNetCore.Tests.csproj | 45 +++++++++++++++++++
 ...pplicationInsights.AspNetCore.Tests.csproj |  8 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft - Backup.ApplicationInsights.AspNetCore.Tests.csproj

diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft - Backup.ApplicationInsights.AspNetCore.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft - Backup.ApplicationInsights.AspNetCore.Tests.csproj
new file mode 100644
index 0000000000..00906f33b3
--- /dev/null
+++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft - Backup.ApplicationInsights.AspNetCore.Tests.csproj	
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(PropsRoot)\Test.props" />
+
+  <PropertyGroup>
+    <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsNetCore)' == 'True'">
+    <!-- TODO: Can't switch to FrameworkReference yet; 
+         'IHostingEnvironment' is obsolete: 'This type is obsolete and will be removed in a future version. 
+         The recommended alternative is Microsoft.AspNetCore.Hosting.IWebHostEnvironment.' -->
+    <!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
+
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Generator>SettingsSingleFileGenerator</Generator>
+    </None>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="content\**">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
index 00906f33b3..039b3d85a7 100644
--- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
+++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,13 +10,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsNetFramework)' == 'True'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.8" /><!--TODO: CAN THIS BE UPGRADED TO 2.2.5 ?-->
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsNetCore)' == 'True'">