Skip to content

[main] Update dependencies from dotnet/runtime #26715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcpopMSFT merged 15 commits into from
Jul 28, 2022
Merged

[main] Update dependencies from dotnet/runtime #26715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b78981d
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 20, 2022
f9e4f79
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 21, 2022
92c00f9
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 22, 2022
71215b9
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 23, 2022
7545f55
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 24, 2022
cfd54c3
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 25, 2022
acdef9a
Native AOT publish changes to be active after runtime changes (#26780)
LakshanF Jul 25, 2022
524c8b2
Fix typo in HostWriter.CreateAppHost (#26786)
LakshanF Jul 25, 2022
59453c0
Change tests to workaround #26791
LakshanF Jul 25, 2022
30af62f
Fix aot telemetry test
LakshanF Jul 26, 2022
9e986c1
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 26, 2022
e2c7716
Fixing tests for the new Trimmer additional warning
LakshanF Jul 26, 2022
a82fd01
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 27, 2022
be39d9a
revert back to setting PublishAot in the project
LakshanF Jul 27, 2022
71a6a68
Update to IsAddingCompleted
marcpopMSFT Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>377229eee1952a8e8aef27d392f74f604e3ff5e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22368.8">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22368.8">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22367.4">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>aafa91036e1efd3d4dcb67eeb261cb6d8f774685</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22368-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -130,30 +130,30 @@
<Sha>60f48c55b5e0183bd1cee4cfa14f1d9ad3d90935</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22368.8">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22369.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>60f48c55b5e0183bd1cee4cfa14f1d9ad3d90935</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22368.8">
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22368.8">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22368.8">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22368.8">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22369.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -299,9 +299,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22368.8">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22376.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9ad302604c492522b4697aedc2ffea42fa53d08f</Sha>
<Sha>2c31641b96d880dfb74d46fe63a91c8b35737cab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22366.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22368.5</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22368.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22376.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22368.8</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22376.8</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22368.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22368.8</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22368.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22368.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22376.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22368.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22367.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22368.8</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22376.8</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-preview.4.22201.3</SystemServiceProcessServiceControllerVersion>
Expand Down Expand Up @@ -88,10 +88,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-rc.1.22368.8</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22368.8</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22368.8</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22368.8</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-rc.1.22376.8</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22376.8</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22376.8</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22376.8</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Installer/Windows/TimestampedFileLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private void WriteLog(object flushThreshold)
/// <param name="message">The message to log.</param>
protected override void WriteMessage(string message)
{
if (!_messageQueue.IsCompleted)
if (!_messageQueue.IsAddingCompleted)
{
_messageQueue.Add(message);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Cli/dotnet/ShellShim/AppHostShimMaker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
appHostDestinationFilePath: appHostDestinationFilePath,
appBinaryFilePath: appBinaryFilePath,
windowsGraphicalUserInterface: (windowsGraphicalUserInterfaceBit == WindowsGUISubsystem),
assemblyToCopyResorcesFrom: entryPointFullPath);
assemblyToCopyResourcesFrom: entryPointFullPath);
}
else
{
// by passing null to assemblyToCopyResorcesFrom, it will skip copying resources,
// by passing null to assemblyToCopyResourcesFrom, it will skip copying resources,
// which is only supported on Windows
HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
appHostDestinationFilePath: appHostDestinationFilePath,
appBinaryFilePath: appBinaryFilePath,
windowsGraphicalUserInterface: false,
assemblyToCopyResorcesFrom: null,
assemblyToCopyResourcesFrom: null,
enableMacOSCodeSign: OperatingSystem.IsMacOS());
}

Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected override void ExecuteCore()
appHostDestinationFilePath: AppHostDestinationPath,
appBinaryFilePath: AppBinaryName,
windowsGraphicalUserInterface: isGUI,
assemblyToCopyResorcesFrom: resourcesAssembly,
assemblyToCopyResourcesFrom: resourcesAssembly,
enableMacOSCodeSign: EnableMacOSCodeSign);
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ protected override void ExecuteCore()
appHostDestinationFilePath: appHostDestinationFilePath,
appBinaryFilePath: appBinaryFilePath,
windowsGraphicalUserInterface: windowsGraphicalUserInterface,
assemblyToCopyResorcesFrom: IntermediateAssembly);
assemblyToCopyResourcesFrom: IntermediateAssembly);
}
else
{
// by passing null to assemblyToCopyResorcesFrom, it will skip copying resources,
// by passing null to assemblyToCopyResourcesFrom, it will skip copying resources,
// which is only supported on Windows
if (windowsGraphicalUserInterface)
{
Expand All @@ -135,7 +135,7 @@ protected override void ExecuteCore()
appHostDestinationFilePath: appHostDestinationFilePath,
appBinaryFilePath: appBinaryFilePath,
windowsGraphicalUserInterface: false,
assemblyToCopyResorcesFrom: null);
assemblyToCopyResourcesFrom: null);
}
}
catch (AppNameTooLongException ex)
Expand Down
16 changes: 0 additions & 16 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILCompiler.targets
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.props" Condition="'$(MSBuildProjectExtension)' == '.vbproj'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.FSharp.props" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.ILCompiler" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.ILLink.Tasks" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Compatibility.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.targets" Condition="'$(Language)' == 'C#'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.targets" Condition="'$(Language)' == 'VB'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.FSharp.targets" Condition="'$(Language)' == 'F#'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.ILCompiler.targets" />
<Import Project="$(ILCompilerTargetsPath)" Condition="'$(PublishAot)' == 'true'"/>
<Import Project="$(ILLinkTargetsPath)" Condition="'$(Language)' != 'C++'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Analyzers.targets" Condition="'$(Language)' == 'C#' or '$(Language)' == 'VB'" />

Expand Down
Loading