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

[main] Update dependencies from dotnet/installer #7170

Merged
merged 11 commits into from
Jul 22, 2022
Merged

[main] Update dependencies from dotnet/installer #7170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3ca5c80
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 14, 2022
e62dcb0
Set TrimMode partial by default (#7132)
agocke Jul 15, 2022
5a264b3
Restore `%(TrimMode)` of `link`
jonathanpeppers Jul 15, 2022
dadc5fe
Update .apkdesc files
jonathanpeppers Jul 16, 2022
2daf570
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 18, 2022
4052c7c
Merge branch 'main' into darc-main-1a7fcdae-fd29-44ca-936b-bdbc39f54705
jonathanpeppers Jul 18, 2022
6517358
Weird merge conflict?
jonathanpeppers Jul 18, 2022
1e33d95
Update .apkdesc files again (merge conflicts)
jonathanpeppers Jul 19, 2022
340d91f
Merge branch 'main' into darc-main-1a7fcdae-fd29-44ca-936b-bdbc39f54705
jonathanpeppers Jul 20, 2022
b7af04f
Set `$(LangVersion)` to 10 in Mono.Android.csproj
jonathanpeppers Jul 21, 2022
c8ea7fe
Fixed Mono.Android.dll size
jonathanpeppers Jul 21, 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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22361.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22364.7">
jonathanpeppers marked this conversation as resolved.
Show resolved Hide resolved
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>85a0482297aed0816aa8518bdfe3076716706ba3</Sha>
<Sha>02c70fd8770705af4827c93623ecd6461876f3a8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22354.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22362.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>ef2d0f25b72469b55925251a79f12bcbf98644bf</Sha>
<Sha>e2b3a925b1ee6c55f9b95540647ce8362fe9ee44</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.7.22362.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>b7fca07f478739d9fd50bdf5d1467c02dc05b6b0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22330.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22361.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>40e7c6226711ec616ee07e725563eda708630fe1</Sha>
<Sha>7d277787570614a3dd99e1d6022375d9ae43e6af</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22361.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22354.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22364.7</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22362.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.7.22362.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22330.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22361.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down