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 Aug 30, 2024
2 parents a2ed68f + 20db1bf commit 3c1edc6
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 82 deletions.
57 changes: 17 additions & 40 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,20 @@
<!-- 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-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-148cecd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-21" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-21/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-20/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-19/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-18" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-18/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-17" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-17/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-15/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-14/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-13/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-11/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-148cecd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-375e494-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-375e4940-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 All @@ -86,26 +75,14 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-148cecd-1" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-10" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-11" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-12" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-13" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-14" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-15" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-17" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-18" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-19" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-2" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-20" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-21" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-3" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-4" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-5" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-6" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-8" value="true" />
<add key="darc-int-dotnet-sdk-148cecd-9" value="true" />
<add key="darc-int-dotnet-sdk-148cecd" value="true" />
<add key="darc-int-dotnet-sdk-375e494-1" value="true" />
<add key="darc-int-dotnet-sdk-375e494-2" value="true" />
<add key="darc-int-dotnet-sdk-375e494-3" value="true" />
<add key="darc-int-dotnet-sdk-375e494-4" value="true" />
<add key="darc-int-dotnet-sdk-375e494-5" value="true" />
<add key="darc-int-dotnet-sdk-375e494-6" value="true" />
<add key="darc-int-dotnet-sdk-375e494-7" value="true" />
<add key="darc-int-dotnet-sdk-375e494" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1526afd-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>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.304">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.400">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>148cecd4fb290c3016c95f3fa12acb0561be369d</Sha>
<Sha>375e4940f138725b41a8a1b75a7ceec82fe426cc</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.304-servicing.24369.9">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.400-rtm.24374.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>148cecd4fb290c3016c95f3fa12acb0561be369d</Sha>
<Sha>375e4940f138725b41a8a1b75a7ceec82fe426cc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.304-servicing.24369.9">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.400-rtm.24374.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>148cecd4fb290c3016c95f3fa12acb0561be369d</Sha>
<Sha>375e4940f138725b41a8a1b75a7ceec82fe426cc</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.304-servicing.24369.9">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.400-rtm.24374.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>148cecd4fb290c3016c95f3fa12acb0561be369d</Sha>
<Sha>375e4940f138725b41a8a1b75a7ceec82fe426cc</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>883fc207bb50622d4458ff09ae6a62548783826a</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-24317-02" 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>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
<Sha>910ca0dcc779068418464794f5af570eda195222</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>08338fcaa5c9b9a8190abb99222fed12aaba956c</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24365.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24365.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>1f9b00a8865f2b30d14ff2012b00f4ce5ddc1086</Sha>
<Sha>9e9c7c1d223bcc6ff6922fd6792d9dfff9cd71ad</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">
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>06</VersionFeature>
<VersionSDKMinor>4</VersionSDKMinor>
<VersionFeature>03</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 @@ -78,16 +78,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.304</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.304-servicing.24369.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.304-servicing.24369.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.400</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.400-rtm.24374.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.400-rtm.24374.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24365.5</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-3.24365.8</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.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>
Expand Down Expand Up @@ -189,7 +189,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.0-release-24352-05</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"
}
}
}
Loading

0 comments on commit 3c1edc6

Please sign in to comment.