提交 023077bd 编写于 作者: J Jeremy Koritzinsky 提交者: Davis Goodin

Move signing dir under eng/. Remove usages of ProjectDir. (dotnet/core-setup#8621)



Commit migrated from https://github.com/dotnet/core-setup/commit/c66b5cabce09f18f472b97c29bea267fbdd6136a
上级 d1e29826
......@@ -10,7 +10,7 @@
<PackageLicenseFile>$(RepoRoot)LICENSE</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
<LicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE</LicenseUrl>
<PackageDescriptionFile>$(ProjectDir)src/pkg/projects/descriptions.json</PackageDescriptionFile>
<PackageDescriptionFile>$(SetupRoot)src/pkg/projects/descriptions.json</PackageDescriptionFile>
<!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
<ProjectUrl>https://dot.net</ProjectUrl>
......@@ -34,7 +34,7 @@
-->
<DebToolBinDir>$(BinDir)dotnet-deb-tool\</DebToolBinDir>
<DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\netcoreapp3.0\dotnet-deb-tool.dll</DebtoolAssemblyFile>
<DotnetDebToolSourceDir>$(ProjectDir)tools-local/setuptools/dotnet-deb-tool/</DotnetDebToolSourceDir>
<DotnetDebToolSourceDir>$(SetupRoot)tools-local/setuptools/dotnet-deb-tool/</DotnetDebToolSourceDir>
<IsDebianBasedDistro
Condition="
......
......@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<PackagingRoot>$(ProjectDir)src/pkg/packaging/</PackagingRoot>
<PackagingRoot>$(SetupRoot)src/pkg/packaging/</PackagingRoot>
<!-- The runtime package is distro-independent. (Runtime-deps packages vary per distro.) -->
<BuildRuntimeDebs>$(BuildDistroIndependentInstallers)</BuildRuntimeDebs>
......
......@@ -32,7 +32,7 @@
<DebPackageVersion>$(HostPackageVersion)</DebPackageVersion>
<InputRoot>$(SharedHostPublishRoot)</InputRoot>
<DebFile>$(SharedHostInstallerFile)</DebFile>
<ManPagesDir>$(ProjectDir)Documentation/manpages</ManPagesDir>
<ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
<ConfigJsonName>dotnet-sharedhost-debian_config.json</ConfigJsonName>
<ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
<debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
......
......@@ -51,19 +51,19 @@
</Target>
<Target Name="EnsureSignedBinaries" Condition="'$(OSGroup)' == 'Windows_NT'" >
<MSBuild Projects="$(SetupRoot)signing\SignBinaries.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
</Target>
<Target Name="EnsureSignedMsiFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
<MSBuild Projects="$(SetupRoot)signing\SignMsiFiles.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
</Target>
<Target Name="EnsureSignedBurnEngineFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
<MSBuild Projects="$(SetupRoot)signing\SignBurnEngineFiles.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignBurnEngineFiles.proj" Targets="Build" />
</Target>
<Target Name="EnsureSignedBurnBundleFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
<MSBuild Projects="$(SetupRoot)signing\SignBurnBundleFiles.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignBurnBundleFiles.proj" Targets="Build" />
</Target>
<Target Name="GenerateProjectInstallers" Condition="'$(GenerateProjectInstallers)' == 'true'">
......@@ -96,7 +96,7 @@
DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
Condition="'$(TargetsUnix)' == 'true'"/>
<Copy SourceFiles="$(ProjectDir)resources/LICENSE-MSFT.txt"
<Copy SourceFiles="$(SetupRoot)resources/LICENSE-MSFT.txt"
DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
Condition="'$(TargetsUnix)' != 'true'"/>
......@@ -157,7 +157,7 @@
<Target Name="GenerateVersionBadge">
<PropertyGroup>
<templateSvg>$(ProjectDir)resources/images/version_badge.svg</templateSvg>
<templateSvg>$(SetupRoot)resources/images/version_badge.svg</templateSvg>
</PropertyGroup>
<MakeDir Condition="!Exists('$(BaseOutputRootPath)')" Directories="$(BaseOutputRootPath)" />
......
......@@ -12,7 +12,7 @@
packages are used in other parts of the build, so this can't wait for Arcade's Pack stage.
-->
<Target Name="Build">
<MSBuild Projects="$(SetupRoot)signing\SignBinaries.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
<ItemGroup>
<ManagedProject Include="$(SetupRoot)src\managed\**\*.csproj" />
......
......@@ -27,7 +27,7 @@
<RpmPackageVersion>$(HostPackageVersion)</RpmPackageVersion>
<InputRoot>$(SharedHostPublishRoot)</InputRoot>
<RpmFile>$(SharedHostInstallerFile)</RpmFile>
<ManPagesDir>$(ProjectDir)Documentation/manpages</ManPagesDir>
<ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
<ConfigJsonName>dotnet-sharedhost-rpm_config.json</ConfigJsonName>
<ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
<RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
......
......@@ -12,7 +12,7 @@
insertion NuGet packages on each project. Bundle installers aren't inserted, so this is enough.
-->
<Target Name="Build" DependsOnTargets="GetSharedFrameworkProjects">
<MSBuild Projects="$(SetupRoot)signing\SignMsiFiles.proj" Targets="Build" />
<MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
<MSBuild Projects="@(PkgprojProjectToBuild);@(SharedFrameworkProject)" Targets="GenerateVSInsertionNupkg" />
</Target>
......
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<SigningToolsDir>$(SetupRoot)signing\</SigningToolsDir>
<LicenseFile>$(RepoRoot)LICENSE</LicenseFile>
</PropertyGroup>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" />
<PropertyGroup>
......@@ -63,7 +58,7 @@
<!-- Pkgproj requires its depproj crossgen outputs to be signed.-->
<OrderProjectReference
Condition="'$(MSBuildProjectExtension)' == '.pkgproj'"
Include="$(SetupRoot)signing\SignBinaries.proj" />
Include="$(SigningToolsDir)\SignBinaries.proj" />
</ItemGroup>
<!-- In *.builds projects, the current phase's name is the same as the project name. -->
......
......@@ -5,7 +5,7 @@
Condition="'$(SkipSigning)' != 'true' and '$(SignType)' != 'public'">
<Message Importance="High" Text="Signing final packages" />
<MSBuild
Projects="$(SetupRoot)signing\SignFinalPackages.proj"
Projects="$(SigningToolsDir)\SignFinalPackages.proj"
Targets="Build"
Properties="DownloadDirectory=$(DownloadDirectory)" />
</Target>
......
......@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<TestDir>$(ProjectDir)src\test\</TestDir>
<TestDir>$(SetupRoot)src\test\</TestDir>
<TestAssetsDir>$(TestDir)Assets\</TestAssetsDir>
<TestStabilizedLegacyPackagesDir>$(ObjDir)TestStabilizedPackages\</TestStabilizedLegacyPackagesDir>
<TestRestorePackagesPath>$(ObjDir)TestPackageCache\</TestRestorePackagesPath>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册