Fix up build and tests now that we are using SDK 2.0.0.

Commit migrated from https://github.com/dotnet/core-setup/commit/f6e89c248c8028cfdb474e1b48f6a9cba7726414

diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj
index 4b78974..374e1ee 100644 (file)
--- a/src/installer/pkg/packaging/dir.proj
+++ b/src/installer/pkg/packaging/dir.proj
@@ -177,7 +177,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <PackArgs>$(NoRestoreArg) --no-build --output $(PackagesOutDir)</PackArgs>
+      <PackArgs>--no-restore --no-build --output $(PackagesOutDir)</PackArgs>
       <PackArgs>$(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging)</PackArgs>
     </PropertyGroup>
 

diff --git a/src/installer/sharedFramework/sharedFramework.proj b/src/installer/sharedFramework/sharedFramework.proj
index f08df43..36985af 100644 (file)
--- a/src/installer/sharedFramework/sharedFramework.proj
+++ b/src/installer/sharedFramework/sharedFramework.proj
@@ -43,7 +43,7 @@
           WorkingDirectory="$(SharedFrameworkSourceRoot)" />
 
     <!-- We publish to a sub folder of the PublishRoot so tools like heat and zip can generate folder structures easier. -->
-    <Exec Command="$(DotnetToolCommand) publish $(NoRestoreArg) --output $(SharedFrameworkNameAndVersionRoot) $(CommonSharedFrameworkArgs)"
+    <Exec Command="$(DotnetToolCommand) publish --no-restore --output $(SharedFrameworkNameAndVersionRoot) $(CommonSharedFrameworkArgs)"
           WorkingDirectory="$(SharedFrameworkSourceRoot)" />
 
     <!-- Clean deps.json -->
@@ -154,7 +154,7 @@
     <Exec Command="$(DotnetRestoreCommandNoPackages) --source $(PackagesOutDir) --packages $(SharedFrameworkIntermediatePackagesDir) $(CommonLockedHostArgs)"
           WorkingDirectory="$(LockedHostSourceRoot)" />
 
-    <Exec Command="$(DotnetToolCommand) publish $(NoRestoreArg) --output $(CoreHostLockedDir) $(CommonLockedHostArgs)"
+    <Exec Command="$(DotnetToolCommand) publish --no-restore --output $(CoreHostLockedDir) $(CommonLockedHostArgs)"
           WorkingDirectory="$(LockedHostSourceRoot)" />
   </Target>
 

diff --git a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
index eff00a2..d86c31d 100644 (file)
--- a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
+++ b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
@@ -5,6 +5,8 @@
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>
+    <NoWarn>NU1603;NU1701</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
index 572a7ea..3df01e5 100644 (file)
--- a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
+++ b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
@@ -7,6 +7,8 @@
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>
+    <NoWarn>NU1603;NU1701</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/installer/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs
index 2b690c4..50441dc 100644 (file)
--- a/src/installer/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs
+++ b/src/installer/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs
@@ -86,8 +86,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup
             // locate the sdkDir from which we can get the files contained in the version folder
             string sdkBaseDir = Path.Combine(fixture.SdkDotnet.BinPath, "sdk");
 
-            var sdkVersionDirs = Directory.EnumerateDirectories(sdkBaseDir);
+            var sdkVersionDirs = Directory.EnumerateDirectories(sdkBaseDir)
+                .Select(p => Path.GetFileName(p));
+
             string greatestVersionSdk = sdkVersionDirs
+                .Where(p => !string.Equals(p, "NuGetFallbackFolder", StringComparison.OrdinalIgnoreCase))
                 .OrderByDescending(p => p.ToLower())
                 .First();
 

diff --git a/src/installer/test/HostActivationTests/HostActivationTests.csproj b/src/installer/test/HostActivationTests/HostActivationTests.csproj
index e9ef49f..fa72d98 100644 (file)
--- a/src/installer/test/HostActivationTests/HostActivationTests.csproj
+++ b/src/installer/test/HostActivationTests/HostActivationTests.csproj
@@ -5,7 +5,6 @@
     <AssemblyName>HostActivationTests</AssemblyName>
     <PackageId>HostActivationTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,12 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
-    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
-    <PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 

diff --git a/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj b/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
index bb7c3c7..6864bf6 100644 (file)
--- a/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
+++ b/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
@@ -9,17 +9,15 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Microsoft.Extensions.DependencyModel.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
-    <PackageReference Include="FluentAssertions" Version="4.0.0" />
-    <PackageReference Include="moq.netcore" Version="4.4.0-beta8" />
-    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
+    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="Moq" Version="4.7.142" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="NuGet.Versioning" Version="4.0.0" />
     <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc2-002702" />

diff --git a/src/installer/test/TestUtils/TestProjectFixture.cs b/src/installer/test/TestUtils/TestProjectFixture.cs
index fe802ae..dd80488 100644 (file)
--- a/src/installer/test/TestUtils/TestProjectFixture.cs
+++ b/src/installer/test/TestUtils/TestProjectFixture.cs
@@ -210,6 +210,8 @@ namespace Microsoft.DotNet.CoreSetup.Test
             _framework = framework;
 
             var buildArgs = new List<string>();
+            buildArgs.Add("--no-restore");
+
             if (runtime != null)
             {
                 buildArgs.Add("--runtime");
@@ -288,6 +290,9 @@ namespace Microsoft.DotNet.CoreSetup.Test
 
             storeArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}");
 
+            // Ensure the project's OutputType isn't 'Exe', since that causes issues with 'dotnet store'
+            storeArgs.Add("/p:OutputType=Library");
+
             dotnet.Store(storeArgs.ToArray())
                 .WorkingDirectory(_testProject.ProjectDirectory)
                 .Environment("NUGET_PACKAGES", _repoDirectoriesProvider.NugetPackages)
@@ -314,6 +319,8 @@ namespace Microsoft.DotNet.CoreSetup.Test
             _framework = framework;
 
             var publishArgs = new List<string>();
+            publishArgs.Add("--no-restore");
+
             if (runtime != null)
             {
                 publishArgs.Add("--runtime");

diff --git a/src/installer/test/TestUtils/TestUtils.csproj b/src/installer/test/TestUtils/TestUtils.csproj
index fc5b080..f745220 100644 (file)
--- a/src/installer/test/TestUtils/TestUtils.csproj
+++ b/src/installer/test/TestUtils/TestUtils.csproj
@@ -6,14 +6,12 @@
     <AssemblyName>TestUtils</AssemblyName>
     <PackageId>TestUtils</PackageId>
     <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.0.0" />
+    <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
-    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
-    <PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
+    <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
   </ItemGroup>

diff --git a/src/installer/test/dir.proj b/src/installer/test/dir.proj
index b8226c3..83e9403 100644 (file)
--- a/src/installer/test/dir.proj
+++ b/src/installer/test/dir.proj
@@ -46,7 +46,7 @@
     <PropertyGroup>
       <RestoreSourceArg>@(RestoreTestSource->'--source %(Identity)', ' ')</RestoreSourceArg>
       <RestoreSourceArg>$(RestoreSourceArg) @(RestoreTestFallbackSource->'--source %(Identity)', ' ')</RestoreSourceArg>
-      <RestoreArgs>--disable-parallel --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(RestoreSourceArg)</RestoreArgs>
+      <RestoreArgs>--packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(RestoreSourceArg)</RestoreArgs>
       <RestoreArgs>$(RestoreArgs) $(MSBuildPassThroughPropertyList) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid)</RestoreArgs>
       <RestorePrefix Condition="'$(OsEnvironment)' != 'Windows_NT'">DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1</RestorePrefix>
     </PropertyGroup>
@@ -59,7 +59,7 @@
           DependsOnTargets="DetermineTestOutputDirectory">
 
     <PropertyGroup>
-      <BuildArgs>$(MSBuildPassThroughPropertyList)</BuildArgs>
+      <BuildArgs>--no-restore $(MSBuildPassThroughPropertyList)</BuildArgs>
     </PropertyGroup>
 
     <Message Text="Building Tests" Importance="High" />
@@ -84,7 +84,7 @@
       <SystemPathTestsOutputDir>$([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>   
     </PropertyGroup>
     <PropertyGroup>
-      <TestArgs>$(MSBuildPassThroughPropertyList)</TestArgs>
+      <TestArgs>--no-restore $(MSBuildPassThroughPropertyList)</TestArgs>
       <IsCrossArch Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel'">true</IsCrossArch>
       <TestResultsXml>$(TestsOutputDir)$(TestProjectFilename)-testResults.trx</TestResultsXml>
     </PropertyGroup>