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

Remove references to PlatformAbstractions. #763

Merged
merged 4 commits into from
May 14, 2020
Merged

Remove references to PlatformAbstractions. #763

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aa390c
Remove references to PlatformAbstractions.
eerhardt May 4, 2020
ea807fb
Remove leftover UsingTask
eerhardt May 4, 2020
5e17b75
Add back CrossGenRootPath to sign binaries
eerhardt May 4, 2020
6681b45
Fix the tests by updating the TFM to 5.0
eerhardt May 4, 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
14 changes: 5 additions & 9 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
<LocalBuildToolsTaskFile>$(LocalBuildToolsTaskDir)local.tasks.dll</LocalBuildToolsTaskFile>
</PropertyGroup>

<PropertyGroup>
<HostMachineInfoProps>$(ObjDir)HostMachineInfo.props</HostMachineInfoProps>
</PropertyGroup>

<PropertyGroup>
<!--
This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging
Expand All @@ -76,6 +72,9 @@
<RunningOnUnix Condition="'$(OS)'!='Windows_NT'">true</RunningOnUnix>

<RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'core'">true</RunningOnCore>

<HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(RunningOnCore)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRuntimeIdentifier>
<HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(RunningOnCore)' != 'true'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -163,11 +162,8 @@
<ExeSuffix Condition="'$(OSGroup)'=='Windows_NT'">.exe</ExeSuffix>
</PropertyGroup>

<Import Project="$(HostMachineInfoProps)"
Condition="Exists('$(HostMachineInfoProps)')" />

<PropertyGroup Condition="'$(OutputRid)' == '' and '$(HostMachineRid)' != ''">
<OutputRid>$(HostMachineRid.Remove($(HostMachineRid.LastIndexOf('-'))))-$(TargetArchitecture)</OutputRid>
<PropertyGroup Condition="'$(OutputRid)' == '' and '$(HostRuntimeIdentifier)' != ''">
<OutputRid>$(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture)</OutputRid>
</PropertyGroup>

<!-- Portable -->
Expand Down
20 changes: 0 additions & 20 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,6 @@
<Target Name="GetInstallerLocations"
DependsOnTargets="GetProductVersions" />

<Target Name="CreateHostMachineInfoFile">
<GetTargetMachineInfo>
<Output PropertyName="HostMachineRid" TaskParameter="RuntimeIdentifier" />
</GetTargetMachineInfo>

<PropertyGroup>
<HostMachineInfoPropsContent>
&lt;Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"&gt;
&lt;PropertyGroup&gt;
&lt;HostMachineRid&gt;$(HostMachineRid)&lt;/HostMachineRid&gt;
&lt;/PropertyGroup&gt;
&lt;/Project&gt;
</HostMachineInfoPropsContent>
</PropertyGroup>

<WriteLinesToFile File="$(HostMachineInfoProps)"
Lines="$(HostMachineInfoPropsContent)"
Overwrite="True" />
</Target>

<Target Name="GetLatestCommitHash"
Condition="'$(LatestCommit)' == ''">
<!-- Get the latest commit hash -->
Expand Down
3 changes: 1 addition & 2 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@
Properties="RepoRoot=$(RepoRoot)"
Targets="
Restore;
Build;
CreateHostMachineInfoFile"/>
Build"/>

<WriteLinesToFile
File="$(RepoTasksOutputFile)"
Expand Down
15 changes: 0 additions & 15 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,6 @@
<FileSignInfo Include="apphost.exe;comhost.dll" CertificateName="None" />
</ItemGroup>

<ItemGroup Condition="'$(SignBinaries)' == 'true'">
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostfxr.dll" />
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostpolicy.dll" />
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/dotnet.exe" />
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/ijwhost.dll" />
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/winrthost.dll" />
<ItemsToSign Include="$(BaseOutputRootPath)corehost/**/nethost.dll" />

<ItemsToSign Include="$(CrossGenRootPath)**/*.dll" />
eerhardt marked this conversation as resolved.
Show resolved Hide resolved

<ItemsToSign Include="$(ArtifactsBinDir)Microsoft.DotNet.PlatformAbstractions/**/*.dll" />
<ItemsToSign Include="$(ArtifactsBinDir)Microsoft.Extensions.DependencyModel/**/*.dll" />
<ItemsToSign Include="$(ArtifactsBinDir)Microsoft.NET.HostModel/**/*.dll" />
</ItemGroup>

<ItemGroup Condition="'$(SignMsiFiles)' == 'true'">
<ItemsToSign Include="$(ArtifactsPackagesDir)**/*.msi" />
<ItemsToSign Include="$(ArtifactsPackagesDir)**/*.cab" />
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.1.101"
"dotnet": "5.0.100-preview.5.20228.8"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2",
Expand Down
6 changes: 1 addition & 5 deletions src/windowsdesktop/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,8 @@
</Target>

<Target Name="DetermineTestOutputDirectory">
<GetTargetMachineInfo>
<Output TaskParameter="RuntimeIdentifier" PropertyName="_HostRid" />
</GetTargetMachineInfo>

<PropertyGroup>
<TestTargetRid Condition="'$(TestTargetRid)' == ''">$(_HostRid)</TestTargetRid>
<TestTargetRid Condition="'$(TestTargetRid)' == ''">$(HostRuntimeIdentifier)</TestTargetRid>
<TestsOutputName Condition="'$(TestsOutputName)' == ''">$(MSBuildProjectName)</TestsOutputName>

<TestsOutputRootDir Condition="'$(TestsOutputRootDir)' == ''">$(ArtifactsDir)tests/$(ConfigurationGroup)/</TestsOutputRootDir>
Expand Down
67 changes: 0 additions & 67 deletions tools-local/tasks/GetTargetMachineInfo.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools-local/tasks/local.tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<ItemGroup>
<PackageReference Include="NuGet.ProjectModel" Version="$(NugetProjectModelVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net46'">
Expand Down