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

Use host model for apphost #3447

Merged
merged 9 commits into from
Jul 27, 2019
Merged

Use host model for apphost #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1f37af
Copy PE bits to generated shims
Jul 22, 2019
fc2c03b
Update src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs
Jul 25, 2019
e3879f2
Update stage 0 and exclude runtime
Jul 25, 2019
a0c6810
Exclude only in core
Jul 26, 2019
b6e12c7
Update stage 0
Jul 26, 2019
3fcf529
fix config and manually update host model
Jul 26, 2019
3573711
only warn when WindowsGraphicalUserInterface need to set
Jul 26, 2019
9c0b034
Need to calcuate WindowsGraphicalUserInterface
Jul 26, 2019
cd01630
Merge branch 'master' into use-HostModel-for-apphost
Jul 26, 2019
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
3 changes: 1 addition & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="3.0.0-preview8-28374-06">
<Dependency Name="Microsoft.NET.HostModel" Version="3.0.0-preview8-28376-08">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>3002d85a81dac020d101a02143f194eb20431cad</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETHostModelVersion>3.0.0-preview8-28374-06</MicrosoftNETHostModelVersion>
<MicrosoftNETHostModelVersion>3.0.0-preview8-28376-08</MicrosoftNETHostModelVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<NuGetBuildTasksPackVersion>5.3.0-preview.2.6103</NuGetBuildTasksPackVersion>
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,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview8-013462",
"dotnet": "3.0.100-preview8-013499",
"vs-opt": {
"version": "15.9"
}
Expand Down
246 changes: 0 additions & 246 deletions src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAppHost.cs
View file
Open in desktop

This file was deleted.

Loading