From 3ef5a9048d8f88a652f93461673e1cadaa0e9c2c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 24 May 2018 13:38:57 -0700
Subject: [PATCH] Update deps
---
test/FunctionalTests/FunctionalTests.csproj | 4 +++-
test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs | 2 ++
testapps/Directory.Build.props | 3 +++
testapps/SimpleApp/SimpleApp.csproj | 2 --
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj
index c0f7d7b8b73..7a6a4d894b2 100644
--- a/test/FunctionalTests/FunctionalTests.csproj
+++ b/test/FunctionalTests/FunctionalTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
@@ -8,6 +8,8 @@
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+ <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
index 931e14422d4..698a598593f 100644
--- a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
+++ b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@@ -71,6 +72,7 @@ namespace FunctionalTests
RuntimeArchitecture.x64)
{
ApplicationName = applicationName,
+ ApplicationType = flavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable,
PublishApplicationBeforeDeployment = true,
Configuration = projectConfiguration,
EnvironmentVariables =
diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props
index 2c0a965d5b8..4d776f550dc 100644
--- a/testapps/Directory.Build.props
+++ b/testapps/Directory.Build.props
@@ -10,6 +10,9 @@
<StandardTestAppTfms>$(DeveloperBuildTestAppTfms)</StandardTestAppTfms>
<StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.2;netcoreapp2.0</StandardTestAppTfms>
<StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestAppTfms);net461</StandardTestAppTfms>
+
+ <!-- Bug in SelfHostDeployer prevents desktop applications from being published without a rid. -->
+ <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
diff --git a/testapps/SimpleApp/SimpleApp.csproj b/testapps/SimpleApp/SimpleApp.csproj
index d484bc0298c..f330f2386dc 100644
--- a/testapps/SimpleApp/SimpleApp.csproj
+++ b/testapps/SimpleApp/SimpleApp.csproj
@@ -2,8 +2,6 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
- <RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
-
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>
--
GitLab