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

Merge branch 'release/8.0.1xx' into release/8.0.2xx

Browse source
This commit is contained in:
Jason Zhai 2024-01-10 02:11:32 -08:00
commit 81db5e02ce
10 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
"version": "1.1.0-beta.23578.2",
"version": "1.1.0-beta.23621.3",
"commands": [
"darc"
]

8
eng/Version.Details.xml
View file

@ -227,13 +227,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23551.2">
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>88b0cbb096999d03068ddc9945465a3f5b6ba5da</Sha>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23551.2">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23621.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>88b0cbb096999d03068ddc9945465a3f5b6ba5da</Sha>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -44,7 +44,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23551.2</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23621.3</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

2
eng/pipelines/templates/steps/vmr-pull-updates.yml
View file

@ -44,7 +44,7 @@ steps:
--repository "installer:${{ parameters.targetRef }}"
--recursive
--remote "installer:$(pwd)"
--readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md
--component-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/Component.template.md
--tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
--debug
displayName: Synchronize dotnet/dotnet

14
eng/vmr-sync.sh
View file

@ -33,10 +33,10 @@
### --debug
### Optional. Turns on the most verbose logging for the VMR tooling
###
### --readme-template
### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of
### --component-template
### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of
### components.
### Defaults to src/VirtualMonoRepo/README.template.md
### Defaults to src/VirtualMonoRepo/Component.template.md
###
### --recursive
### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml)
@ -103,7 +103,7 @@ repository=''
additional_remotes=''
recursive=false
verbosity=verbose
readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md"
readme_template="$installer_dir/src/VirtualMonoRepo/Component.template.md"
tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
azdev_pat=''
@ -138,8 +138,8 @@ while [[ $# -gt 0 ]]; do
additional_remotes="$additional_remotes $2"
shift
;;
--readme-template)
readme_template=$2
--component-template)
component_template=$2
shift
;;
--tpn-template)
@ -266,7 +266,7 @@ fi
--$verbosity \
$recursive_arg \
$additional_remotes \
--readme-template "$readme_template" \
--component-template "$component_template" \
--tpn-template "$tpn_template" \
"$repository"

12
src/VirtualMonoRepo/README.template.md → src/SourceBuild/content/README.md
View file

@ -152,17 +152,7 @@ To do this, you can start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Co
## List of components
To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here:
- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md)
- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process)
### Detailed list
<!-- component list beginning -->
> Auto-generated list of components will go here
<!-- component list end -->
The full list of components synchronized into the VMR is [here (Components.md)](./Components.md).
The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format.

15
src/VirtualMonoRepo/Component.template.md Normal file
View file

@ -0,0 +1,15 @@
# List of components
To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here:
- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md)
- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process)
## Detailed list
<!-- component list beginning -->
> Auto-generated list of components will go here
<!-- component list end -->
The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format.

2
src/VirtualMonoRepo/InitializeVMR.proj
View file

@ -58,7 +58,7 @@
VmrPath="$(VmrDir)"
TmpPath="$(TmpDir)"
InstallerPath="$(RepoRoot)"
ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md"
ComponentTemplatePath="$(MSBuildThisFileDirectory)/Component.template.md"
TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt"
SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" />

4
src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs
View file

@ -42,7 +42,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
public string InstallerPath { get; set; }
public string ReadmeTemplatePath { get; set; }
public string ComponentTemplatePath { get; set; }
public string TpnTemplatePath { get; set; }
@ -72,7 +72,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
Recursive,
new NativePath(SourceMappingsPath),
additionalRemotes,
ReadmeTemplatePath,
ComponentTemplatePath,
TpnTemplatePath,
generateCodeowners: false,
discardPatches: true,

2
src/core-sdk-tasks/BuildFPMToolPreReqs.cs
View file

@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks
// -a : architecture --JSON
// -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON
// --rpm-os : the operating system to target this rpm --Static
// --rpm-digest : rpm digest algorithm --Static
// --rpm-changelog : the changelog from FILEPATH contents --ARG
// --rpm-summary : it is the RPM summary that shows in the Title --JSON
// --description : it is the description for the package --JSON
@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks
}
parameters.Add("--rpm-os linux");
parameters.Add("--rpm-digest sha256");
parameters.Add(string.Concat("--rpm-changelog ",
EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File
parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description)));