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

Merge branch 'release/8.0.4xx' of https://github.com/dotnet/installer into merge/release/8.0.3xx-to-release/8.0.4xx

Browse source
This commit is contained in:
Jason Zhai 2024-08-08 01:08:25 -07:00
commit 335f0e27d8
6 changed files with 73 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
NuGet.config
View file

@ -30,6 +30,7 @@
<!-- 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-0c86109" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0c861097/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
@ -39,16 +40,6 @@
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-3ecaf32" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-11/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3ecaf320-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" />
@ -80,16 +71,6 @@
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-3ecaf32-1" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-10" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-11" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-2" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-3" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-4" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-5" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-6" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32-7" value="true" />
<add key="darc-int-dotnet-sdk-3ecaf32" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" />

4
eng/SourceBuildPrebuiltBaseline.xml
View file

@ -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.*" />

50
eng/Version.Details.xml
View file

@ -85,22 +85,22 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>2f1db20456007c9515068a35a65afdf99af70bc6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.303">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.400-preview.24362.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a7681c04a92d48db3407d9f64e3c8ec31e332a0c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.303-servicing.24317.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.400-preview.24362.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a7681c04a92d48db3407d9f64e3c8ec31e332a0c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.303-servicing.24317.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.400-preview.24362.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a7681c04a92d48db3407d9f64e3c8ec31e332a0c</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.303-servicing.24317.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>3ecaf32089ff44b59b6cfc518baf20be49886604</Sha>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.400-preview.24362.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a7681c04a92d48db3407d9f64e3c8ec31e332a0c</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>
@ -132,36 +132,36 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>43bb8cc831c2658e1117415019264bfe6f644f94</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.400-beta.24351.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17</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.400-beta.24351.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24272-11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.11.0-release-24352-05" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>83d73f783bf54c336d1eab04a53d554f8a6c0b19</Sha>
<Sha>910ca0dcc779068418464794f5af570eda195222</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24314.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
<Sha>259e82e9f20dd3dd3ec961f352ddcf9bc29072ea</Sha>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24358.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>26240cf3e46e45a9fc8c879f793793defe2c0b2a</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.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
<Sha>0c86109772ea0fae22af6a7ad7b582e75d280689</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.2.97" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.11.0-rc.122" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf</Sha>
<Sha>c0d441fc5e99e6765c9e0b2f77de162b9866b305</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">

20
eng/Versions.props
View file

@ -7,8 +7,8 @@
<PropertyGroup>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>3</VersionSDKMinor>
<VersionFeature>05</VersionFeature>
<VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>01</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
@ -25,7 +25,7 @@
<VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature60>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 33))</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. -->
@ -78,16 +78,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.303</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.303-servicing.24317.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.303-servicing.24317.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.400-preview.24362.13</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.400-preview.24362.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.400-preview.24362.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24314.14</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-3.24358.9</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
@ -120,11 +120,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.10.0-preview.2.97</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.11.0-rc.122</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/msbuild -->
<MicrosoftBuildPackageVersion>17.10.4</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.11.3</MicrosoftBuildPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
@ -187,7 +187,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.10.0-release-24272-11</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.11.0-release-24352-05</MicrosoftNETTestSdkVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->

25
github-merge-flow.jsonc Normal file
View file

@ -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
src/redist/targets/GenerateRPMs.targets
View file

@ -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)"