Skip to content
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

Jump to bottom

[net8.0] Update dependencies from dotnet/installer #18489

Merged
merged 12 commits into from
Jun 26, 2023
Merged

[net8.0] Update dependencies from dotnet/installer #18489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c215ebe
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jun 22, 2023
f93fce7
Re-generate global.json
Jun 22, 2023
bcf0dd1
Bump to preview 7 since we're getting preview 7 packages from dotnet/…
rolfbjarne Jun 22, 2023
e6744bf
Merge remote-tracking branch 'origin/net8.0' into darc-net8.0-1c70c22…
rolfbjarne Jun 22, 2023
17c96c9
[dotnet] Handle more complex variations of LinkerFlag.
rolfbjarne Jun 23, 2023
271f239
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jun 24, 2023
d744052
Re-generate global.json
Jun 24, 2023
aef630b
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jun 25, 2023
4528d12
Re-generate global.json
Jun 25, 2023
4769da0
[dotnet] Fix MSBuild logic.
rolfbjarne Jun 26, 2023
f4fce06
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jun 26, 2023
5f17c04
Re-generate global.json
Jun 26, 2023
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
2 changes: 1 addition & 1 deletion Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ endif
##
## Note that the prerelease identifier should be as short as possible, because otherwise
## the resulting package name can become too long for MSIs.
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-p6
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-p7
NUGET_HARDCODED_PRERELEASE_BRANCH=net8.0

# compute the alphanumeric version of branch names
Expand Down
31 changes: 30 additions & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,12 +1281,41 @@

Note: this means ILC doesn't support linker flags with spaces in them.

Additionally, the LinkerArg item group are actually passed to the
native compiler by the NativeAOT build tasks, not the native
linker. This means they might contain wrapped linker arguments:
'-Wl,...', which the compiler understands, but not the linker.
Thus we need to unwrap the (compiler) arguments in LinkerArgs to
be actual linker arguments. Also note that there can be multiple
linker arguments passed using a single compiler argument, and
those are separated by a comma: "-Wl,-linkerarg1,-linkerarg2", so
we need to split those into multiple linker arguments as well. And
to make things even more complicated, there may be quotes as well:
<LinkerArg>'-Wl,-linkerarg1,-linkerarg2'</LinkerArg>.

-->
<PropertyGroup>
<_LinkerArgsSplitBySemiColon>@(LinkerArg->Replace(' ',';'))</_LinkerArgsSplitBySemiColon>
</PropertyGroup>
<ItemGroup>
<_CustomLinkFlags Include="$(_LinkerArgsSplitBySemiColon.Split(';'))" />
<_AllLinkerArgs Include="$(_LinkerArgsSplitBySemiColon.Split(';'))" />
<_LinkerArgsWhichAreReallyCompilerArgs Include="@(_AllLinkerArgs)" Condition="$([System.String]::new('%(Identity)').StartsWith('-Wl,'))">
<TransformedArgument>$([System.String]::new('%(Identity)').Substring(4))</TransformedArgument>
</_LinkerArgsWhichAreReallyCompilerArgs>
<!-- Handle quoted arguments: <LinkerArg>'-Wl,-linkerarg'</LinkerArg> -->
<_LinkerArgsWhichAreReallyCompilerArgs Include="@(_AllLinkerArgs)" Condition="$([System.String]::new('%(Identity)').StartsWith('%27-Wl,')) And $([System.String]::new('%(Identity)').EndsWith('%27'))">
<TransformedArgument>$([System.String]::new('%(Identity)').Substring(5, $([MSBuild]::Subtract($([System.String]::new('%(Identity)').Length), 6))))</TransformedArgument>
</_LinkerArgsWhichAreReallyCompilerArgs>
<_CompilerArgsTransformedToLinkerArgs Include="@(_LinkerArgsWhichAreReallyCompilerArgs->'%(TransformedArgument)')" />
</ItemGroup>
<PropertyGroup>
<_CompilerArgsTransformedToLinkerArgsSplitByComma>@(_CompilerArgsTransformedToLinkerArgs->Replace(',',';'))</_CompilerArgsTransformedToLinkerArgsSplitByComma>
</PropertyGroup>
<ItemGroup>
<_AllLinkerArgs Remove="@(_LinkerArgsWhichAreReallyCompilerArgs)" />
<_AllLinkerArgs Include="$(_CompilerArgsTransformedToLinkerArgsSplitByComma.Split(';'))" />

<_CustomLinkFlags Include="@(_AllLinkerArgs)" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.6.23320.7">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23325.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>7a0bb9fd747b5ed6e5f84911a944686068c1a9e6</Sha>
<Sha>d2a244f560b9f89387a5e748c19adf3114153f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
<Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
<Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.7.23324.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
<Sha>213eb282fc6d9ce07a1e0a1fbe526c297694ebf6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.6.23312.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23321.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>1640faa87e2e7656bf20dfe38eb8ea3cc3b9e806</Sha>
<Sha>e004a85d8403425945865746116db641ba096df7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23312.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23319.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>ad66dcb8a04dabce995d3557832ed8d53e594d0c</Sha>
<Sha>f449dc99239d16ed4d329207101244e8438e6d3d</Sha>
</Dependency>
<!-- This is a subscription of the .NET 7 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7073">
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.6.23320.7</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23325.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23325.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.6.23312.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23325.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23321.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>7.0.7</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23312.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23319.2</MicrosoftDotNetCecilPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.100-preview.6.23320.7"
"version": "8.0.100-preview.7.23325.5"
}
}