Skip to content

Obsolete RepositoryRoot property, replace with RepoRoot #975

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

Merged
merged 1 commit into from
May 15, 2019
Merged

Obsolete RepositoryRoot property, replace with RepoRoot #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PropertyGroup>
<RepositoryUrl>https://github.com/aspnet/BuildTools</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions build/repo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<Error Text="Missing property: Version" Condition="'$(Version)' == ''" />

<ItemGroup>
<Content Include="$(RepositoryRoot)files\KoreBuild\**\*" />
<Content Include="$(RepoRoot)files\KoreBuild\**\*" />
<VersionFileLines Include="version:$(Version)" />
<VersionFileLines Include="commithash:$(BUILD_SOURCEVERSION)" />
</ItemGroup>
Expand All @@ -61,7 +61,7 @@
<WriteLinesToFile File="$(_KoreBuildIntermediateDir).version" Lines="@(VersionFileLines)" Overwrite="true" />

<ItemGroup>
<_ModuleProjects Include="$(RepositoryRoot)modules\%(KoreBuildModule.Identity)\%(Identity).*proj">
<_ModuleProjects Include="$(RepoRoot)modules\%(KoreBuildModule.Identity)\%(Identity).*proj">
<AdditionalProperties>Version=$(Version);PublishDir=$(_KoreBuildIntermediateDir)modules\%(Identity)\</AdditionalProperties>
</_ModuleProjects>
</ItemGroup>
Expand All @@ -75,7 +75,7 @@
<KoreBuildFiles Include="$(_KoreBuildIntermediateDir)**\*" />
</ItemGroup>

<Copy SourceFiles="$(RepositoryRoot)scripts\UploadKoreBuild.ps1" DestinationFiles="$(KoreBuildUploadScriptFile)" SkipUnchangedFiles="true" />
<Copy SourceFiles="$(RepoRoot)scripts\UploadKoreBuild.ps1" DestinationFiles="$(KoreBuildUploadScriptFile)" SkipUnchangedFiles="true" />
<WriteLinesToFile File="$(KoreBuildLatestTxtFile)" Lines="@(VersionFileLines)" Overwrite="true"/>
<WriteLinesToFile File="$(KoreBuildChannelTxtFile)" Lines="$(KoreBuildChannel)" Overwrite="true"/>
<GenerateSvgBadge Label="version" Value="$(Version)" OutputPath="$(KoreBuildBadgeFile)" />
Expand Down
4 changes: 2 additions & 2 deletions build/tasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(RepositoryRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.props" />
<Import Project="$(RepoRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.props" />

<PropertyGroup>
<TargetFramework Condition=" '$(MSBuildRuntimeType)' == 'core' ">netcoreapp3.0</TargetFramework>
Expand All @@ -19,5 +19,5 @@
<Compile Include="..\..\modules\BuildTools.Tasks\RunDotNet.cs" />
</ItemGroup>

<Import Project="$(RepositoryRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.targets" />
<Import Project="$(RepoRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.targets" />
</Project>
2 changes: 1 addition & 1 deletion docs/Logging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Logging
-------

KoreBuild produces log files to $(RepositoryRoot)/artifacts/logs. The following log formats can be used:
KoreBuild produces log files to $(RepoRoot)/artifacts/logs. The following log formats can be used:

## Binary Logger

Expand Down
12 changes: 7 additions & 5 deletions files/KoreBuild/KoreBuild.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,19 @@ Default layout and configuration.
<Configuration Condition="'$(CI)' == 'true'">Release</Configuration>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<BuildProperties>$(BuildProperties);Configuration=$(Configuration)</BuildProperties>
<RepositoryRoot Condition="'$(RepositoryRoot)' == ''">$(MSBuildStartupDirectory)</RepositoryRoot>
<RepositoryRoot>$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))</RepositoryRoot>
<ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))artifacts\</ArtifactsDir>
<RepoRoot Condition="'$(RepoRoot)' == ''">$(MSBuildStartupDirectory)</RepoRoot>
<RepoRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))</RepoRoot>
<!-- Older targets using KoreBuild use RepositoryRoot. Update to use RepoRoot whenever possible as a part of migrating to Arcade. -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Older targets" where exactly? In this repo still or in aspnet/AspNetCore for a very short time?

Suggest adding some more info to this comment unless the older targets won't exist in a couple of days.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This project is still open source so anyone could be using KoreBuild. At least a few teams at Microsoft are still using KoreBuild and I don't want to completely break them. Eventually we will completely retire KoreBuild because we only care about supporting the AspNetCore repo.

<RepositoryRoot>$(RepoRoot)</RepositoryRoot>
<ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))artifacts\</ArtifactsDir>
<BuildDir>$(ArtifactsDir)build\</BuildDir>
<LogOutputDir Condition="'$(LogOutputDir)' == ''">$(ArtifactsDir)logs\</LogOutputDir>
<IntermediateDir Condition="'$(IntermediateDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))obj\</IntermediateDir>
<IntermediateDir Condition="'$(IntermediateDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))obj\</IntermediateDir>

<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(NUGET_PACKAGES)</NuGetPackageRoot>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' AND '$(USERPROFILE)' != '' ">$(USERPROFILE)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' AND '$(HOME)' != '' ">$(HOME)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(RepositoryRoot)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(RepoRoot)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)'))</NuGetPackageRoot>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions files/KoreBuild/KoreBuild.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ after all other property imports.

<PackageVersion Condition="'$(PackageVersion)' == '' AND '$(Version)' != '' ">$(Version)</PackageVersion>
<BuildProperties>$(BuildProperties);RepoVersion=$(Version);RepoPackageVersion=$(PackageVersion)</BuildProperties>
<BuildProperties Condition=" ! Exists('$(RepositoryRoot)version.props') ">$(BuildProperties);VerifyVersion=false</BuildProperties>
<BuildProperties Condition=" ! Exists('$(RepoRoot)version.props') ">$(BuildProperties);VerifyVersion=false</BuildProperties>
</PropertyGroup>

<!--
Expand All @@ -46,7 +46,7 @@ extending the *DependsOn property

<Target Name="GetRepoInfo" Returns="@(RepoInfo)">
<ItemGroup>
<RepoInfo Include="$(RepositoryRoot)">
<RepoInfo Include="$(RepoRoot)">
<Version>$(Version)</Version>
<PackageVersion>$(PackageVersion)</PackageVersion>
<BuildNumber>$(BuildNumber)</BuildNumber>
Expand Down Expand Up @@ -93,7 +93,7 @@ extending the *DependsOn property
<MSBuild Targets="GetArtifactInfo"
Projects="@(ProjectToBuild)"
Condition="@(ProjectToBuild->Count()) != 0"
Properties="$(BuildProperties);DesignTimeBuild=true;NoBuild=true;RepositoryRoot=$(RepositoryRoot);CustomAfterMicrosoftCommonTargets=$(_InspectionTargetsFile);CustomAfterMicrosoftCommonCrossTargetingTargets=$(_InspectionTargetsFile)"
Properties="$(BuildProperties);DesignTimeBuild=true;NoBuild=true;RepoRoot=$(RepoRoot);RepositoryRoot=$(RepositoryRoot);CustomAfterMicrosoftCommonTargets=$(_InspectionTargetsFile);CustomAfterMicrosoftCommonCrossTargetingTargets=$(_InspectionTargetsFile)"
BuildInParallel="$(BuildInParallel)"
RemoveProperties="$(_BuildPropertiesToRemove)">

Expand Down
10 changes: 5 additions & 5 deletions files/KoreBuild/KoreBuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@

<!-- props -->
<Import Project="$(CustomBeforeKoreBuildProps)" Condition="'$(CustomBeforeKoreBuildProps)' != '' AND Exists('$(CustomBeforeKoreBuildProps)')" />
<Import Project="$(RepositoryRoot)build\repo.beforecommon.props" Condition="Exists('$(RepositoryRoot)build\repo.beforecommon.props')" />
<Import Project="$(RepoRoot)build\repo.beforecommon.props" Condition="Exists('$(RepoRoot)build\repo.beforecommon.props')" />
<Import Project="KoreBuild.Common.props" />
<Import Project="modules\*\module.props" />
<Import Project="$(CustomKoreBuildModulesPath)\*\module.props" Condition="Exists('$(CustomKoreBuildModulesPath)')" />

<Import Project="$(RepositoryRoot)version.props" Condition="Exists('$(RepositoryRoot)version.props')" />
<Import Project="$(RepositoryRoot)build\repo.props" Condition="Exists('$(RepositoryRoot)build\repo.props')" />
<Import Project="$(RepositoryRoot)build\tasks\*.tasks" Condition="Exists('$(RepositoryRoot)build\tasks\')" />
<Import Project="$(RepoRoot)version.props" Condition="Exists('$(RepoRoot)version.props')" />
<Import Project="$(RepoRoot)build\repo.props" Condition="Exists('$(RepoRoot)build\repo.props')" />
<Import Project="$(RepoRoot)build\tasks\*.tasks" Condition="Exists('$(RepoRoot)build\tasks\')" />

<!-- targets -->
<Import Project="KoreBuild.Common.targets" />
<Import Project="modules\*\module.targets" />
<Import Project="$(CustomKoreBuildModulesPath)\*\module.targets" Condition="Exists('$(CustomKoreBuildModulesPath)')" />
<Import Project="$(RepositoryRoot)build\repo.targets" Condition="Exists('$(RepositoryRoot)build\repo.targets')" />
<Import Project="$(RepoRoot)build\repo.targets" Condition="Exists('$(RepoRoot)build\repo.targets')" />
<Import Project="KoreBuild.Overrides.targets" />
<Import Project="$(CustomAfterKoreBuildTargets)" Condition="'$(CustomAfterKoreBuildTargets)' != '' AND Exists('$(CustomAfterKoreBuildTargets)')" />
<Import Project="KoreBuild.Verify.targets" />
Expand Down
2 changes: 2 additions & 0 deletions files/KoreBuild/Project.Inspection.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<TargetFrameworks>$([MSBuild]::Escape($(TargetFrameworks)))</TargetFrameworks>
<PackageType>$(PackageType)</PackageType>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
<RepoRoot>$(RepoRoot)</RepoRoot>
<RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
<Category>$(PackageArtifactCategory)</Category>
<Certificate>$(PackageSigningCertName)</Certificate>
Expand All @@ -58,6 +59,7 @@
<SourceIncluded>$(IncludeSource)</SourceIncluded>
<PackageType>$(PackageType)</PackageType>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
<RepoRoot>$(RepoRoot)</RepoRoot>
<RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
<Category>$(PackageArtifactCategory)</Category>
<Certificate>$(PackageSigningCertName)</Certificate>
Expand Down
4 changes: 2 additions & 2 deletions files/KoreBuild/modules/projectbuild/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FYI: targets, properties, and items that begin with an underscore are meant to b
</ItemDefinitionGroup>

<ItemGroup Condition="'$(DisableDefaultItems)' != 'true' AND '$(BuildSolutions)' == 'false' ">
<ProjectToBuild Include="$(RepositoryRoot)**\*.csproj;$(RepositoryRoot)**\*.fsproj;$(RepositoryRoot)**\*.vbproj" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' == '' " />
<ProjectToBuild Include="$(RepoRoot)**\*.csproj;$(RepoRoot)**\*.fsproj;$(RepoRoot)**\*.vbproj" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' == '' " />
<ProjectToBuild Include="$(Projects)" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' != '' " />
</ItemGroup>

Expand Down Expand Up @@ -56,7 +56,7 @@ Executes /t:{Target} on all projects
</Target>

<Target Name="_EnsureProjects">
<Error Text="No solutions found to build in '$(RepositoryRoot)'" Condition="@(ProjectToBuild->Count()) == 0" />
<Error Text="No solutions found to build in '$(RepoRoot)'" Condition="@(ProjectToBuild->Count()) == 0" />
</Target>

<Target Name="RestoreProjects" DependsOnTargets="ResolveProjects;_EnsureProjects" Condition="'$(NoRestore)' != 'true'">
Expand Down
2 changes: 1 addition & 1 deletion files/KoreBuild/modules/sharedsources/module.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<SharedSourcesFolder Condition="'$(SharedSourcesFolder)' == ''">$(RepositoryRoot)shared/</SharedSourcesFolder>
<SharedSourcesFolder Condition="'$(SharedSourcesFolder)' == ''">$(RepoRoot)shared/</SharedSourcesFolder>
</PropertyGroup>

<ItemGroup Condition=" '$(DisableSharedSources)' != 'true' ">
Expand Down
3 changes: 2 additions & 1 deletion files/KoreBuild/modules/sharedsources/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Target: PackSharedSources

Creates a content files package for all each directory in
that matches "$(RepositoryRoot)/shared/*.Sources".
that matches "$(RepoRoot)/shared/*.Sources".
###################################################################
-->
<Project>
Expand Down Expand Up @@ -40,6 +40,7 @@ that matches "$(RepositoryRoot)/shared/*.Sources".
<PropertyGroup>
<_SharedSourcesPackageProperties>
RepositoryRoot=$(RepositoryRoot);
RepoRoot=$(RepoRoot);
ImportDirectoryBuildProps=false;
</_SharedSourcesPackageProperties>
<_SharedSourcesPackageProperties Condition=" '$(OverridePackageOutputPath)' != 'false' ">
Expand Down
11 changes: 6 additions & 5 deletions files/KoreBuild/modules/sharedsources/sharedsources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<Target Name="VerifyProperties">
<Error Text="Missing property: RepositoryRoot" Condition="'$(RepositoryRoot)'==''"/>
<Error Text="Missing property: RepoRoot" Condition="'$(RepoRoot)'==''"/>
<Error Text="Missing property: PackageId" Condition="'$(PackageId)'==''"/>
<Error Text="Missing property: NuspecBasePath" Condition="'$(NuspecBasePath)'==''"/>
</Target>

<Import Project="$(RepositoryRoot)build\common.props" Condition="Exists('$(RepositoryRoot)build\common.props')" />
<Import Project="$(RepoRoot)build\common.props" Condition="Exists('$(RepoRoot)build\common.props')" />
<Import Project="$(NuspecBasePath)sharedsources.props" Condition="Exists('$(NuspecBasePath)sharedsources.props')" />

<Target Name="WarnIfNoCommonProps" BeforeTargets="Pack">
<Warning Text="Expected a props file in '$(RepositoryRoot)build\common.props' or '$(DirBuildPropsInRepo)')'. The package $(PackageId) may be missing the right version number when this is left out."
Condition="!Exists('$(RepositoryRoot)build\common.props') And !Exists('$(DirBuildPropsInRepo)')"/>
<Warning Text="Expected a props file in '$(RepoRoot)build\common.props' or '$(DirBuildPropsInRepo)')'. The package $(PackageId) may be missing the right version number when this is left out."
Condition="!Exists('$(RepoRoot)build\common.props') And !Exists('$(DirBuildPropsInRepo)')"/>
</Target>

<PropertyGroup>
<IsPackable>true</IsPackable>
<NoBuild>true</NoBuild>
<PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(RepositoryRoot)artifacts\build</PackageOutputPath>
<PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(RepoRoot)artifacts\build</PackageOutputPath>
<TargetFramework>netstandard1.0</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<PackageId Condition=" '$(PackageId)' == '' ">$(ProjectDirName)</PackageId>
Expand Down Expand Up @@ -78,6 +78,7 @@
<Version>$(NormalizedPackageVersion)</Version>
<TargetFramework>$(TargetFramework)</TargetFramework>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
<RepoRoot>$(RepoRoot)</RepoRoot>
<RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
<Category>$(PackageArtifactCategory)</Category>
<IsContainer>true</IsContainer>
Expand Down
12 changes: 6 additions & 6 deletions files/KoreBuild/modules/solutionbuild/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ FYI: targets, properties, and items that begin with an underscore are meant to b
</PropertyGroup>

<ItemGroup Condition="'$(DisableDefaultItems)' != 'true' AND '$(BuildSolutions)' == 'true' ">
<Solutions Include="$(RepositoryRoot)*.sln" Exclude="@(ExcludeSolutions)" />
<ProjectsToPack Include="$(RepositoryRoot)src\*\*.csproj" Exclude="@(ExcludeFromPack)" />
<Solutions Include="$(RepoRoot)*.sln" Exclude="@(ExcludeSolutions)" />
<ProjectsToPack Include="$(RepoRoot)src\*\*.csproj" Exclude="@(ExcludeFromPack)" />

<!-- put unit test projects ahead of functional tests -->
<_FunctionalTests Include="$(RepositoryRoot)test\*\*FunctionalTest*.csproj" Exclude="@(ExcludeFromTest)" />
<ProjectsToTest Include="$(RepositoryRoot)test\*\*.csproj" Exclude="@(_FunctionalTests);@(ExcludeFromTest)" />
<_FunctionalTests Include="$(RepoRoot)test\*\*FunctionalTest*.csproj" Exclude="@(ExcludeFromTest)" />
<ProjectsToTest Include="$(RepoRoot)test\*\*.csproj" Exclude="@(_FunctionalTests);@(ExcludeFromTest)" />
<ProjectsToTest Include="@(_FunctionalTests)" />
<BenchmarksToValidate Include="$(RepositoryRoot)benchmarks\*\*.csproj" />
<BenchmarksToValidate Include="$(RepoRoot)benchmarks\*\*.csproj" />

</ItemGroup>

Expand Down Expand Up @@ -59,7 +59,7 @@ Executes /t:{Target} on all solutions
</Target>

<Target Name="_EnsureSolutions">
<Error Text="No solutions found to build in '$(RepositoryRoot)'" Condition="@(Solutions->Count()) == 0" />
<Error Text="No solutions found to build in '$(RepoRoot)'" Condition="@(Solutions->Count()) == 0" />
</Target>

<Target Name="RestoreSolutions" DependsOnTargets="ResolveSolutions;_EnsureSolutions" Condition="'$(NoRestore)' != 'true'">
Expand Down
2 changes: 1 addition & 1 deletion files/KoreBuild/scripts/KoreBuild.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function Invoke-RepositoryBuild(
/verbosity:minimal
/p:KoreBuildVersion=$koreBuildVersion
/p:SuppressNETCoreSdkPreviewMessage=true
/p:RepositoryRoot="$Path\\"
/p:RepoRoot="$Path\\"
"$msBuildLogArgument"
"$makeFileProj"
"@
Expand Down
2 changes: 1 addition & 1 deletion files/KoreBuild/scripts/invoke-repository-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ cat > "$msbuild_response_file" <<ENDMSBUILDARGS
/nodeReuse:false
/p:KoreBuildVersion=$korebuild_version
/p:SuppressNETCoreSdkPreviewMessage=true
/p:RepositoryRoot="$repo_path/"
/p:RepoRoot="$repo_path/"
"$msbuild_log_argument"
"$korebuild_proj"
ENDMSBUILDARGS
Expand Down
2 changes: 1 addition & 1 deletion modules/BuildTools.Tasks/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Generates resource files
###################################################################
-->
<Target Name="Resx" DependsOnTargets="ResolveSolutions">
<Warning Text="No solutions found to build in '$(RepositoryRoot)'" Condition="'@(Solutions)' == ''" />
<Warning Text="No solutions found to build in '$(RepoRoot)'" Condition="'@(Solutions)' == ''" />

<PropertyGroup>
<_ResxTargets>$(MSBuildThisFileDirectory)Project.CSharp.Resx.targets</_ResxTargets>
Expand Down
4 changes: 2 additions & 2 deletions modules/KoreBuild.Tasks/CodeSign.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<DisableCodeSigning Condition=" '$(OS)' != 'Windows_NT' ">true</DisableCodeSigning>

<!-- This file can be used to exclude something files from signcheck. -->
<SignCheckExclusionsFile Condition=" '$(SignCheckExclusionsFile)' == '' ">$(RepositoryRoot)build\signcheck.exclusions.txt</SignCheckExclusionsFile>
<SignCheckExclusionsFile Condition=" '$(SignCheckExclusionsFile)' == '' ">$(RepoRoot)build\signcheck.exclusions.txt</SignCheckExclusionsFile>

<SignCheckWorkingDir Condition=" '$(SignCheckWorkingDir)' == '' ">$(ArtifactsDir)</SignCheckWorkingDir>

<!-- Relative paths in SignToolData.json are relative to this path -->
<SignToolDataWorkingDir Condition=" '$(SignToolDataWorkingDir)' == '' ">$(RepositoryRoot)</SignToolDataWorkingDir>
<SignToolDataWorkingDir Condition=" '$(SignToolDataWorkingDir)' == '' ">$(RepoRoot)</SignToolDataWorkingDir>

<!-- Dry run checks signing config without applying authenticode signatures to files. -->
<SignToolDryRun Condition=" '$(SignType)' != 'real' AND '$(SignType)' != 'test' ">true</SignToolDryRun>
Expand Down
2 changes: 1 addition & 1 deletion modules/KoreBuild.Tasks/module.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
Specifies a required .NET Core SDK.

Examples:
<DotNetCoreSdk Include="coherent" Channel="master" InstallDir="$(RepositoryRoot)\.siteextension\" />
<DotNetCoreSdk Include="coherent" Channel="master" InstallDir="$(RepoRoot)\.siteextension\" />
-->
<DotNetCoreSdk>
<Arch>$(DefaultDotNetAssetArch)</Arch>
Expand Down
4 changes: 2 additions & 2 deletions modules/KoreBuild.Tasks/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<PrepareDependsOn Condition=" '$(DisableDefaultTargets)' != 'true' ">GetToolsets;$(PrepareDependsOn)</PrepareDependsOn>
<RestoreDependsOn Condition=" '$(DisableDefaultTargets)' != 'true' ">InstallDotNet;$(RestoreDependsOn)</RestoreDependsOn>

<KoreBuildConfigFile Condition="'$(KoreBuildConfigFile)' == ''">$(RepositoryRoot)korebuild.json</KoreBuildConfigFile>
<DependencyVersionsFile Condition="'$(DependencyVersionsFile)' == ''">$(RepositoryRoot)build\dependencies.props</DependencyVersionsFile>
<KoreBuildConfigFile Condition="'$(KoreBuildConfigFile)' == ''">$(RepoRoot)korebuild.json</KoreBuildConfigFile>
<DependencyVersionsFile Condition="'$(DependencyVersionsFile)' == ''">$(RepoRoot)build\dependencies.props</DependencyVersionsFile>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion modules/NuGetPackageVerifier/module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repository root.
###################################################################
-->
<PropertyGroup>
<NuGetVerifierRuleFile Condition=" '$(NuGetVerifierRuleFile)' == '' ">$(RepositoryRoot)NuGetPackageVerifier.json</NuGetVerifierRuleFile>
<NuGetVerifierRuleFile Condition=" '$(NuGetVerifierRuleFile)' == '' ">$(RepoRoot)NuGetPackageVerifier.json</NuGetVerifierRuleFile>
</PropertyGroup>

<ItemGroup>
Expand Down