mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4600 from dotnet/merges/release/3.0.100-preview9-to-release/3.0.1xx

Browse source 
Merge release/3.0.100-preview9 to release/3.0.1xx
This commit is contained in:
Daniel Plaisted 2019-09-10 17:13:37 -07:00 • committed by GitHub
commit 82c5e8502c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/redist/targets/GenerateBundledVersions.targets
View file

@ -107,11 +107,11 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0" DefaultVersion="2.1.0"
LatestVersion="2.1.12" /> LatestVersion="2.1.13" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.6" /> LatestVersion="2.2.7" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="3.0" TargetFrameworkVersion="3.0"
DefaultVersion="$(_NETCoreAppPackageVersion)" DefaultVersion="$(_NETCoreAppPackageVersion)"
@ -120,20 +120,20 @@
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.12"/> LatestVersion="2.1.13"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.12"/> LatestVersion="2.1.13"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.6"/> LatestVersion="2.2.7"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.6"/> LatestVersion="2.2.7"/>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

44
test/SdkTests/SdkTests.csproj
View file

@ -27,6 +27,7 @@
<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath> <RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
<DotnetToTestPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\</DotnetToTestPath> <DotnetToTestPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\</DotnetToTestPath>
<TestExecutionDirectory>$([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests'))</TestExecutionDirectory> <TestExecutionDirectory>$([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests'))</TestExecutionDirectory>
<DOTNET_CLI_HOME>$(ArtifactsTmpDir)DOTNET_CLI_HOME\</DOTNET_CLI_HOME>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -191,8 +192,20 @@
<MakeDir Directories="$(ArtifactsTestResultsDir)" /> <MakeDir Directories="$(ArtifactsTestResultsDir)" />
<Exec Command="dotnet new tool-manifest" <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
WorkingDirectory="$(TestLocalToolFolder)"/> <ToolRunPrefix>$(ToolRunPrefix)set MSBuildSDKsPath=&amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_HOST_PATH=&amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR=&amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)dotnet new tool-manifest"
WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
<PropertyGroup> <PropertyGroup>
<SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion> <SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
@ -202,15 +215,15 @@
<InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand> <InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand>
<InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand> <InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand>
</PropertyGroup> </PropertyGroup>
<Exec Command="$(InstallToolCommand)" <Exec Command="$(ToolRunPrefix)$(InstallToolCommand)"
WorkingDirectory="$(TestLocalToolFolder)"/> WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
<Exec Command="dotnet tool restore" <!--<Exec Command="$(ToolRunPrefix)dotnet tool restore"
WorkingDirectory="$(TestLocalToolFolder)"/> WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>-->
<PropertyGroup> <PropertyGroup>
<ResultsXmlPath>$(ArtifactsTestResultsDir)$(TestProjectName).xml</ResultsXmlPath> <ResultsXmlPath>$(ArtifactsTestResultsDir)$(TestProjectName).xml</ResultsXmlPath>
@ -233,19 +246,14 @@
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml"</TestArgs> <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml"</TestArgs>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> <PropertyGroup Condition=" '$(IslinuxPortable)' == 'true' ">
<ToolRunPrefix>$(ToolRunPrefix)set MSBuildSDKsPath= &amp;&amp; </ToolRunPrefix> <!-- Add list of tests to skip on Linux Portable -->
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_HOST_PATH= &amp;&amp; </ToolRunPrefix> <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR= &amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
</PropertyGroup> </PropertyGroup>
<Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)" <Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)" /> WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
</Target> </Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

7
test/SdkTests/TestsToSkipPortableLinux.xml Normal file
View file

@ -0,0 +1,7 @@
<Tests>
<SkippedTests>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_publishes_as_framework_dependent_by_default"
Skip="true"
Reason="https://github.com/NuGet/Home/issues/8571"/>
</SkippedTests>
</Tests>