Skip to content

Commit

Permalink
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/installer …
Browse files Browse the repository at this point in the history 
…into merge/release/8.0.3xx-to-release/8.0.4xx
  • Loading branch information
@v-wuzhai
v-wuzhai committed Oct 12, 2024
2 parents dbb7be8 + bba8ab3 commit 0edd233
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 78 deletions.
55 changes: 19 additions & 36 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,21 @@
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a69bbaa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a69bbaaf/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-5cad18d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-21" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-21/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-20/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-19/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-18" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-18/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-13/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-11/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-5cad18d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5cad18df-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
Expand Down Expand Up @@ -96,24 +88,15 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-5cad18d-1" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-10" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-11" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-12" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-13" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-18" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-19" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-2" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-20" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-21" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-3" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-4" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-5" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-6" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-7" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-8" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d-9" value="true" />
<add key="darc-int-dotnet-sdk-5cad18d" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-1" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-10" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-2" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-3" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-4" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-5" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-6" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-9" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="true" />
Expand Down
4 changes: 2 additions & 2 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<UsagePattern IdentityGlob="NuGet.*/*" />

<!-- These MSBuild packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
<UsagePattern IdentityGlob="Microsoft.Build*/17.10.4" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />
<UsagePattern IdentityGlob="Microsoft.Build*/17.11.*" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.11.*" />

<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.306">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.403">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5cad18dfda0ff1c3051dcf9d35945c853b0063a0</Sha>
<Sha>aaee17ef7954216c7d62f9ec4b60d51f126f7306</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.306-servicing.24469.20">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.403-servicing.24469.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5cad18dfda0ff1c3051dcf9d35945c853b0063a0</Sha>
<Sha>aaee17ef7954216c7d62f9ec4b60d51f126f7306</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.306-servicing.24469.20">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.403-servicing.24469.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5cad18dfda0ff1c3051dcf9d35945c853b0063a0</Sha>
<Sha>aaee17ef7954216c7d62f9ec4b60d51f126f7306</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.306-servicing.24469.20">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.403-servicing.24469.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5cad18dfda0ff1c3051dcf9d35945c853b0063a0</Sha>
<Sha>aaee17ef7954216c7d62f9ec4b60d51f126f7306</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand Down Expand Up @@ -132,36 +132,36 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>e84ed744bb7989299c544f715056d05e220c7e00</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.401-beta.24421.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>af2f522de602281d4ef5a7b71507c428e814c5c1</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.401-beta.24421.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>af2f522de602281d4ef5a7b71507c428e814c5c1</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24317-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.11.1-release-24455-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
<Sha>7855c9b221686104532ebf3380f2d45b3613b369</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24468.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24468.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
<Sha>b4e5d1dde7212b8c1636632220682ca40bed90b7</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.10.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.11.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
<Sha>a69bbaaf5f8d7249b8cab7309e81ad2221ce396c</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.10.2-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.11.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>b42cb884109d8d33c956311f1a8c89a90be0c195</Sha>
<Sha>5469bd0d9de8108f15f21644759773b85471366c</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<PropertyGroup>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>3</VersionSDKMinor>
<VersionFeature>07</VersionFeature>
<VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>04</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
Expand All @@ -25,7 +25,7 @@
<VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature60>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 32))</VersionFeature60>
<VersionFeature70>20</VersionFeature70>
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
Expand Down Expand Up @@ -77,16 +77,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.306</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.306-servicing.24469.20</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.306-servicing.24469.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.403</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.403-servicing.24469.19</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.403-servicing.24469.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24468.7</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-3.24468.6</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
Expand Down Expand Up @@ -121,11 +121,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.10.2-rc.8</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.11.1-rc.2</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/msbuild -->
<MicrosoftBuildPackageVersion>17.10.4</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.11.9</MicrosoftBuildPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down Expand Up @@ -167,7 +167,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.10.0-release-24317-02</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.11.1-release-24455-02</MicrosoftNETTestSdkVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->
Expand Down
25 changes: 25 additions & 0 deletions github-merge-flow.jsonc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// IMPORTANT: This file is read by the merge flow from main branch only.
{
"merge-flow-configurations": {
// Automate opening PRs to merge cli release/6.0.1xx to .4xx
"release/6.0.1xx":{
"MergeToBranch": "release/6.0.4xx",
"ExtraSwitches": "-QuietComments"
},
// Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx
"release/6.0.4xx":{
"MergeToBranch": "release/8.0.1xx",
"ExtraSwitches": "-QuietComments"
},
// Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx
"release/8.0.1xx":{
"MergeToBranch": "release/8.0.3xx",
"ExtraSwitches": "-QuietComments"
},
// Automate opening PRs to merge cli release/8.0.3xx to 8.0.4xx
"release/8.0.3xx":{
"MergeToBranch": "release/8.0.4xx",
"ExtraSwitches": "-QuietComments"
}
}
}
20 changes: 10 additions & 10 deletions src/redist/targets/GenerateRPMs.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,17 +333,17 @@

<!-- Install Dependencies and SDK Packages -->
<Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
<Exec Command="sudo rpm -iv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" />
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
<Exec Command="sudo rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -iv $(SdkRPMInstallerFile)" />
<Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" />

<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
<DotNetRestore ProjectPath="$(EndToEndTestProject)"
Expand Down

0 comments on commit 0edd233

Please sign in to comment.