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 Jan 17, 2025
2 parents 394c348 + 11e07bc commit dc16bdc
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 57 deletions.
25 changes: 9 additions & 16 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,17 @@
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
<!-- 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-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-55a73a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-55a73a0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f6ad34c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-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 @@ -67,14 +64,10 @@
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-55a73a0-1" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-2" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-3" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-4" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-5" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-6" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0-7" value="true" />
<add key="darc-int-dotnet-sdk-55a73a0" value="true" />
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="true" />
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="true" />
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="true" />
<add key="darc-int-dotnet-sdk-f6ad34c" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0dad47b-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 emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/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>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.308">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.405">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>55a73a0e7f0c08bb832c2dceeb49287223efef1f</Sha>
<Sha>f6ad34c0ba03ad79257a09903033493414af4ffa</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.308-servicing.24604.16">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.405-servicing.24604.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>55a73a0e7f0c08bb832c2dceeb49287223efef1f</Sha>
<Sha>f6ad34c0ba03ad79257a09903033493414af4ffa</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.308-servicing.24604.16">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.405-servicing.24604.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>55a73a0e7f0c08bb832c2dceeb49287223efef1f</Sha>
<Sha>f6ad34c0ba03ad79257a09903033493414af4ffa</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.308-servicing.24604.16">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.405-servicing.24604.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>55a73a0e7f0c08bb832c2dceeb49287223efef1f</Sha>
<Sha>f6ad34c0ba03ad79257a09903033493414af4ffa</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>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</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.403-beta.24526.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</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.403-beta.24526.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</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.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24574.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>64e323ff5a3f88b1eae1c6d728441e73a38a9daa</Sha>
<Sha>bc1c3011064a493b0ca527df6fb7215e2e5cfa96</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
18 changes: 9 additions & 9 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>09</VersionFeature>
<VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>06</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
Expand Down Expand Up @@ -77,16 +77,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.308</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.308-servicing.24604.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.308-servicing.24604.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.405</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.405-servicing.24604.17</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.405-servicing.24604.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24574.6</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-3.24554.2</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
Expand Down Expand Up @@ -122,11 +122,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 @@ -168,7 +168,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
15 changes: 15 additions & 0 deletions github-merge-flow.jsonc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// IMPORTANT: This file is read by the merge flow from main branch only.
{
"merge-flow-configurations": {
// 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 dc16bdc

Please sign in to comment.