Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
82c5bd73
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
82c5bd73
编写于
2月 22, 2021
作者:
V
Viktor Hofer
提交者:
GitHub
2月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Delete unused installer properties (#48569)
* Delete unused msbuild properties, targets and files
上级
49cfb350
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
1 addition
and
120 deletion
+1
-120
src/installer/Directory.Build.props
src/installer/Directory.Build.props
+0
-23
src/installer/Directory.Build.targets
src/installer/Directory.Build.targets
+1
-60
src/installer/pkg/Directory.Build.props
src/installer/pkg/Directory.Build.props
+0
-13
src/installer/pkg/Directory.Build.targets
src/installer/pkg/Directory.Build.targets
+0
-7
src/installer/pkg/projects/Directory.Build.props
src/installer/pkg/projects/Directory.Build.props
+0
-17
未找到文件。
src/installer/Directory.Build.props
浏览文件 @
82c5bd73
...
...
@@ -10,9 +10,6 @@
</PropertyGroup>
<PropertyGroup>
<ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</ArcadeSdkMSBuildProjectDir>
<ArcadeSdkSignProject>$(ArcadeSdkMSBuildProjectDir)Sign.proj</ArcadeSdkSignProject>
<!-- Clear AssemblyVersion as we need to align with the NuGet conventions, when empty arcade will do that for us. -->
<AssemblyVersion />
</PropertyGroup>
...
...
@@ -74,26 +71,6 @@
<OutputVersionBadge>$(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg</OutputVersionBadge>
</PropertyGroup>
<PropertyGroup>
<DotnetHostString>dotnet-host-</DotnetHostString>
<DotnetHostFxrString>dotnet-hostfxr-</DotnetHostFxrString>
<DotnetRuntimeString>dotnet-runtime-</DotnetRuntimeString>
<DotnetRuntimeDependenciesPackageString>dotnet-runtime-deps-</DotnetRuntimeDependenciesPackageString>
<CombinedInstallerStart>$(AssetOutputPath)$(DotnetRuntimeString)</CombinedInstallerStart>
<SharedHostInstallerStart>$(AssetOutputPath)$(DotnetHostString)</SharedHostInstallerStart>
<HostFxrInstallerStart>$(AssetOutputPath)$(DotnetHostFxrString)</HostFxrInstallerStart>
<SharedFrameworkInstallerStart>$(AssetOutputPath)$(DotnetRuntimeString)</SharedFrameworkInstallerStart>
<DotnetRuntimeDependenciesPackageInstallerStart>$(AssetOutputPath)$(DotnetRuntimeDependenciesPackageString)</DotnetRuntimeDependenciesPackageInstallerStart>
<!-- OSX specific intermediate package suffix . OSX specific intermediate packages are suffixed with -internal to avoid name collision for bundle package (dotnet-runtime-*)
and runtime ( earlier as dotnet-sharedframework-*) -->
<InstallerStartSuffix Condition="'$(TargetOS)' == 'OSX'">internal</InstallerStartSuffix>
<SharedHostInstallerStart Condition="'$(TargetOS)' == 'OSX'">$(SharedHostInstallerStart)$(InstallerStartSuffix)-</SharedHostInstallerStart>
<HostFxrInstallerStart Condition="'$(TargetOS)' == 'OSX'">$(HostFxrInstallerStart)$(InstallerStartSuffix)-</HostFxrInstallerStart>
<SharedFrameworkInstallerStart Condition="'$(TargetOS)' == 'OSX'">$(SharedFrameworkInstallerStart)$(InstallerStartSuffix)-</SharedFrameworkInstallerStart>
</PropertyGroup>
<PropertyGroup>
<!-- Never use the NuGet fallback folder that comes with the SDK we use to build.
The NuGet fallback folder can/will contain packages we are building in this repo, and we
...
...
src/installer/Directory.Build.targets
浏览文件 @
82c5bd73
...
...
@@ -12,13 +12,6 @@
<!-- Provide default targets which can be hooked onto or overridden as necessary -->
<Target Name="Pack" />
<!-- Common target to find all sfxproj. In a target to avoid evaluating for every project. -->
<Target Name="GetSharedFrameworkProjects">
<ItemGroup>
<SharedFrameworkProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" />
</ItemGroup>
</Target>
<!--
Arcade SDK versioning is defined by static properties in a targets file: work around this by
moving properties based on versioning into a target.
...
...
@@ -39,11 +32,8 @@
<ProductVersion>$(ProductionVersion)$(ProductVersionSuffix)</ProductVersion>
<SharedFrameworkNugetVersion>$(ProductVersion)</SharedFrameworkNugetVersion>
<RuntimeDepsRpmVersion Condition="'$(RuntimeDepsRpmVersion)'==''">$(ProductVersion)</RuntimeDepsRpmVersion>
<RuntimeDepsDebVersion Condition="'$(RuntimeDepsDebVersion)'==''">$(ProductVersion)</RuntimeDepsDebVersion>
<NuGetVersion>$(SharedFrameworkNugetVersion)</NuGetVersion>
<InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
<!--
By default, we are always building the nuget packages for HostPolicy, HostFXR and
...
...
@@ -82,55 +72,6 @@
<UseShippedHostPolicyPackage>false</UseShippedHostPolicyPackage>
<HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' != 'true'">$(ProductVersion)</HostPolicyVersion>
<HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' == 'true'">2.0.0</HostPolicyVersion>
<InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
</PropertyGroup>
<PropertyGroup>
<HostPackageVersion>$(HostVersion)</HostPackageVersion>
<HostPackageRelease>1</HostPackageRelease>
<HostResolverPackageVersion>$(HostResolverVersion)</HostResolverPackageVersion>
<HostResolverPackageRelease>1</HostResolverPackageRelease>
<RuntimePackageVersion>$(SharedFrameworkNugetVersion)</RuntimePackageVersion>
<RuntimePackageRelease>1</RuntimePackageRelease>
<RuntimeDepsDebPackageVersion>$(RuntimeDepsDebVersion)</RuntimeDepsDebPackageVersion>
<RuntimeDepsDebPackageRelease>1</RuntimeDepsDebPackageRelease>
<RuntimeDepsRpmPackageVersion>$(RuntimeDepsRpmVersion)</RuntimeDepsRpmPackageVersion>
<RuntimeDepsRpmPackageRelease>1</RuntimeDepsRpmPackageRelease>
</PropertyGroup>
<PropertyGroup Condition="'$(InstallerExtension)' == '.deb'">
<HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
<HostPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</HostPackageVersion>
<HostResolverPackageVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductionVersion)</HostResolverPackageVersion>
<HostResolverPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</HostResolverPackageVersion>
<RuntimePackageVersion>$(ProductionVersion)</RuntimePackageVersion>
<RuntimePackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">$(ProductionVersion)~$(VersionSuffix)</RuntimePackageVersion>
<RuntimeDepsDebPackageVersion>$(ProductionVersion)</RuntimeDepsDebPackageVersion>
<RuntimeDepsDebPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</RuntimeDepsDebPackageVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(InstallerExtension)' == '.rpm'">
<HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
<HostPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</HostPackageRelease>
<HostPackageRelease>$([System.String]::Copy('$(HostPackageRelease)').Replace('-', '_'))</HostPackageRelease>
<HostResolverPackageVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductionVersion)</HostResolverPackageVersion>
<HostResolverPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</HostResolverPackageRelease>
<HostResolverPackageRelease>$([System.String]::Copy('$(HostResolverPackageRelease)').Replace('-', '_'))</HostResolverPackageRelease>
<RuntimePackageVersion>$(ProductionVersion)</RuntimePackageVersion>
<RuntimePackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</RuntimePackageRelease>
<RuntimePackageRelease>$([System.String]::Copy('$(RuntimePackageRelease)').Replace('-', '_'))</RuntimePackageRelease>
<RuntimeDepsRpmPackageVersion>$(ProductionVersion)</RuntimeDepsRpmPackageVersion>
<RuntimeDepsRpmPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</RuntimeDepsRpmPackageRelease>
<RuntimeDepsRpmPackageRelease>$([System.String]::Copy('$(RuntimeDepsRpmPackageRelease)').Replace('-', '_'))</RuntimeDepsRpmPackageRelease>
</PropertyGroup>
</Target>
</Project>
src/installer/pkg/Directory.Build.props
浏览文件 @
82c5bd73
...
...
@@ -19,17 +19,4 @@
<ItemGroup>
<PackageIndex Include="$(PackageIndexFile)" />
</ItemGroup>
<Target Name="ValidateArgs" Condition="'$(CLIBuildVersion)'==''">
<Error Condition="'$(HostPolicyVersion)'==''" Text="HostPolicyVersion is undefined" />
<Error Condition="'$(HostResolverVersion)'==''" Text="HostResolverVersion is undefined" />
<Error Condition="'$(HostVersion)'==''" Text="HostVersion is undefined" />
<Error Condition="'$(AppHostVersion)'==''" Text="AppHostVersion is undefined" />
</Target>
<Target Name="ValidatePreReleaseStrings" Condition="'$(StabilizePackageVersion)'!='true'">
<Error Condition="'$(PreReleaseVersionLabel)'==''" Text="PreReleaseVersionLabel is undefined" />
<Error Condition="'$(BuildNumberMajor)'==''" Text="BuildNumberMajor is undefined" />
<Error Condition="'$(BuildNumberMinor)'==''" Text="BuildNumberMinor is undefined" />
</Target>
</Project>
src/installer/pkg/Directory.Build.targets
浏览文件 @
82c5bd73
...
...
@@ -54,13 +54,6 @@
</PropertyGroup>
</Target>
<!-- Ensure the deb tool is built. -->
<Target Name="InitializeDotnetDebTool">
<MSBuild
Projects="$(DotnetDebToolSourceDir)dotnet-deb-tool.csproj"
Targets="Restore;Build" />
</Target>
<!--
Check if the deb package build tool prereq is available.
This issue tracks adding a way to raise this as a build error: https://github.com/dotnet/core-setup/issues/5396
...
...
src/installer/pkg/projects/Directory.Build.props
浏览文件 @
82c5bd73
...
...
@@ -8,8 +8,6 @@
<!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. -->
<OutputPath>$(PackageOutputPath)</OutputPath>
<PackageTargetRuntime Condition="'$(PackageTargetRuntime)' == '' AND '$(MSBuildProjectExtension)' == '.depproj'">$(RuntimeIdentifier)</PackageTargetRuntime>
<BuildRuntimePackages Condition="'$(BuildRuntimePackages)' == ''">true</BuildRuntimePackages>
<BuildLineupPackage Condition="'$(BuildLineupPackage)' == ''">true</BuildLineupPackage>
...
...
@@ -61,21 +59,6 @@
<IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.depproj'">
<!--
we don't want any analyzers by ResolveNuGetPackageAssets
null-refs when this isn't set and an analyzer is in the packages
-->
<Language>unused</Language>
<NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
<PackageTargetFramework>$(NetCoreAppCurrent)</PackageTargetFramework>
<CrossGenOutputPath>$(CrossGenRootPath)$(MSBuildProjectName)\</CrossGenOutputPath>
<ContainsPackageReferences>true</ContainsPackageReferences>
<RidSpecificAssets Condition="'$(RuntimeIdentifier)' != ''">true</RidSpecificAssets>
<CrossGenSymbolsOutputPath>$(PackageSymbolsBinDir)/$(MSBuildProjectName)</CrossGenSymbolsOutputPath>
</PropertyGroup>
<PropertyGroup>
<TargetFramework Condition="'$(TargetFramework)' == ''">$(PackageTargetFramework)</TargetFramework>
<TargetFramework Condition="'$(TargetFramework)' == ''">$(NetCoreAppCurrent)</TargetFramework>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录