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

Merge

Browse source
This commit is contained in:
wtgodbe 2022-08-25 15:08:20 -07:00
commit c1fec16d95
7 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
eng/Version.Details.xml
View file

@ -19,7 +19,7 @@
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
<Sha>754d13817d834b716d339183e21aac7d2489c496</Sha>
<SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22423.18" CoherentParentDependency="Microsoft.NET.Sdk">
@ -200,22 +200,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22422.1">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22425.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>a27d5e56acf479b4a0944a0cf4511acb22d4a75b</Sha>
<Sha>af1ca588ca991b9b570725581f7c7a4580629d3d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-preview.7.22375.6">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -226,14 +226,14 @@
<Sha>c1bc837421e41a673cb30bf670c0cdd83ac09b75</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22418-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22423-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>a74d21bcfa0f928b0cb1dab9fa6ff8a17248c584</Sha>
<Sha>0bba6b2d342056cb3fb3906f25929a92e063c5f8</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22418.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>a125e2b00ca0add2a2a23e0ba67f8ae6a4b1a1ee</Sha>
<Sha>d106fdda2b3eda55f12e72977de336ab3afa1d91</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

4
eng/Versions.props
View file

@ -26,11 +26,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22422.1</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22425.1</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
eng/common/generate-locproject.ps1
View file

@ -62,7 +62,7 @@ $locJson = @{
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
@ -98,7 +98,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22419.1"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22424.3"
}
}

10
src/SourceBuild/tarball/content/src/source-mappings.json
View file

@ -1,4 +1,5 @@
{
"patchesPath": "src/installer/src/SourceBuild/tarball/patches",
"defaults": {
"defaultRef": "main",
"exclude": [
@ -58,12 +59,19 @@
{
"name": "installer",
"defaultRemote": "https://github.com/dotnet/installer",
"defaultRef": "vmr"
"exclude": [
"src/SourceBuild/tarball/content/**/*"
]
},
{
"name": "linker",
"defaultRemote": "https://github.com/dotnet/linker"
},
{
"name": "llvm-project",
"defaultRemote": "https://github.com/dotnet/llvm-project",
"defaultRef": "dotnet/main"
},
{
"name": "msbuild",
"defaultRemote": "https://github.com/dotnet/msbuild"

4
src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
View file

@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
+++ b/global.json
@@ -5,6 +5,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
- "Microsoft.Build.Traversal": "2.0.2"
+ "Microsoft.Build.Traversal": "2.0.34"
}

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

@ -39,9 +39,8 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
private async Task<bool> ExecuteAsync()
{
var factory = _serviceProvider.Value.GetRequiredService<IVmrManagerFactory>();
var vmrManager = await factory.CreateVmrManager(_serviceProvider.Value, VmrPath, TmpPath);
await vmrManager.InitializeVmr(Repository, Revision, false, _cancellationToken.Token);
var vmrInitializer = _serviceProvider.Value.GetRequiredService<IVmrInitializer>();
await vmrInitializer.InitializeVmr(Repository, Revision, false, _cancellationToken.Token);
return true;
}
@ -49,9 +48,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
private IServiceProvider CreateServiceProvider() => new ServiceCollection()
.AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
.AddTransient<IProcessManager>(sp => ActivatorUtilities.CreateInstance<ProcessManager>(sp, "git"))
.AddSingleton<ISourceMappingParser, SourceMappingParser>()
.AddSingleton<IVmrManagerFactory, VmrManagerFactory>()
.AddSingleton<IRemoteFactory>(sp => ActivatorUtilities.CreateInstance<RemoteFactory>(sp, TmpPath))
.AddVmrManagers("git", sp => new VmrManagerConfiguration(VmrPath, TmpPath))
.BuildServiceProvider();
}