projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 49cfb35)
Delete unused installer properties (#48569)
authorViktor Hofer <viktor.hofer@microsoft.com>
Mon, 22 Feb 2021 11:49:14 +0000 (12:49 +0100)
committerGitHub <noreply@github.com>
Mon, 22 Feb 2021 11:49:14 +0000 (12:49 +0100)
* Delete unused msbuild properties, targets and files

src/installer/Directory.Build.props patch | blob | history
src/installer/Directory.Build.targets patch | blob | history
src/installer/pkg/Directory.Build.props patch | blob | history
src/installer/pkg/Directory.Build.targets patch | blob | history
src/installer/pkg/projects/Directory.Build.props patch | blob | history

diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index 7b51841..0ab6a6e 100644 (file)
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -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>
@@ -75,26 +72,6 @@
   </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
          want to ensure we use the correct packages.
diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets
index 70420a1..c33c699 100644 (file)
--- a/src/installer/Directory.Build.targets
+++ b/src/installer/Directory.Build.targets
@@ -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>
diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props
index 92f5bd1..ff5b20d 100644 (file)
--- a/src/installer/pkg/Directory.Build.props
+++ b/src/installer/pkg/Directory.Build.props
@@ -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>
diff --git a/src/installer/pkg/Directory.Build.targets b/src/installer/pkg/Directory.Build.targets
index 3aa7a9a..f98063d 100644 (file)
--- a/src/installer/pkg/Directory.Build.targets
+++ b/src/installer/pkg/Directory.Build.targets
@@ -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
diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
index f347850..e95f6a1 100644 (file)
--- a/src/installer/pkg/projects/Directory.Build.props
+++ b/src/installer/pkg/projects/Directory.Build.props
@@ -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>
Domain: Dotnet / Core;