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

Ensure we test packages for browser #41041

Closed
wants to merge 4 commits into from
Closed

Ensure we test packages for browser #41041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30fb6b3
Ensure we test packages for browser
ericstj Aug 19, 2020
f708261
Use Preview7 build of dotnet/runtime
ericstj Aug 19, 2020
7fda2ff
Fix HostModel to compile with latest S.T.Json
ericstj Aug 20, 2020
c921179
Update src/installer/managed/Microsoft.NET.HostModel/ComHost/ClsidMap.cs
ericstj Aug 21, 2020
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
Expand Up @@ -154,17 +154,17 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>4e6a09468cb4e4e1be38ac25fcf866ca8136638b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-preview.4.20202.18">
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-preview.7.20364.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
<Sha>53976d38b1bd6917b8fa4d1dd4f009728ece3adb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-preview.4.20202.18">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-preview.7.20364.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
<Sha>53976d38b1bd6917b8fa4d1dd4f009728ece3adb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-preview.4.20202.18">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-preview.7.20364.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
<Sha>53976d38b1bd6917b8fa4d1dd4f009728ece3adb</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="5.0.0-alpha.1.19563.3">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -178,9 +178,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bdfbf0cf85878673a80d7822cc11bde5c9fda30c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="5.0.0-preview.4.20202.18">
<Dependency Name="System.Text.Json" Version="5.0.0-preview.7.20364.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
<Sha>53976d38b1bd6917b8fa4d1dd4f009728ece3adb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20378.1">
<Uri>https://github.com/mono/linker</Uri>
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
Expand Up @@ -60,9 +60,9 @@
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20374.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20374.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreAppVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20359.4</MicrosoftNETCoreILAsmVersion>
Expand Down Expand Up @@ -91,7 +91,7 @@
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.7.0</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
<SystemTextJsonVersion>5.0.0-preview.4.20202.18</SystemTextJsonVersion>
<SystemTextJsonVersion>5.0.0-preview.7.20364.11</SystemTextJsonVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
Expand Down
4 changes: 4 additions & 0 deletions eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<Project>
<ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
<DefaultValidateFramework Update="net5.0" RuntimeIDs="%(RuntimeIDs);browser-wasm" />
</ItemGroup>

<!-- There are some packages where we require only one ref for a specific framework to be present. In order to avoid problems with this package when targetting
dektop with RAR we will make sure there are no exclude=compile references in the package.
For more info, please check issues:
Expand Down
2 changes: 1 addition & 1 deletion src/installer/managed/Microsoft.NET.HostModel/ComHost/ClsidMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void Create(MetadataReader metadataReader, string clsidMapPath)

using (StreamWriter writer = File.CreateText(clsidMapPath))
{
writer.Write(JsonSerializer.Serialize(clsidMap, new JsonSerializerOptions { IgnoreNullValues = true }));
writer.Write(JsonSerializer.Serialize(clsidMap, new JsonSerializerOptions { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }));
}
}

Expand Down