Skip to content

Commit 4654d68

Browse files
dseefelddseefeld
authored
Pass in PackageVersion.props as a file url via prodcon api for (#505)
all projects built with repotoolset. Set DependencyVersionInputRepoApiImplemented=false so we don't pass PackageVersion.props via the source-build api.
1 parent 192f86e commit 4654d68

6 files changed

+36
-31
lines changed

‎patches/cli/0010-Roslyn-plat-assembly-paths-for-RemainingTargets.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎repos/cli-migrate.proj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) --restore --pack --configuration $(Configuration)</BuildCommand>
5+
<BuildCommandArgs>--restore --pack --configuration $(Configuration)</BuildCommandArgs>
6+
7+
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
8+
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
9+
10+
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
611
<OrchestratedManifestBuildName>dotnet/cli-migrate</OrchestratedManifestBuildName>
712
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
813
<NuGetConfigFile>$(ProjectDirectory)/nuget.config</NuGetConfigFile>
914
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
15+
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
1016
<UsesRepoToolset>true</UsesRepoToolset>
1117

1218
<!-- ProdCon is behind source-build: temporarily disable auto-update. -->
@@ -22,6 +28,7 @@
2228
<RepositoryReference Include="newtonsoft-json" />
2329
<RepositoryReference Include="core-setup" />
2430
<RepositoryReference Include="roslyn-tools" />
31+
<RepositoryReference Include="roslyn" />
2532
</ItemGroup>
2633

2734
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />

‎repos/clicommandlineparser.proj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) --restore --pack --configuration $(Configuration)</BuildCommand>
5+
<BuildCommandArgs>--restore --pack --configuration $(Configuration)</BuildCommandArgs>
6+
7+
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
8+
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
9+
10+
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
11+
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
612
<UsesRepoToolset>true</UsesRepoToolset>
713
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
814
<!-- This repo is on a source-build dev branch. -->

‎repos/sdk.proj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44
<PropertyGroup>
55
<OfficialBuildId>20180427.7</OfficialBuildId>
66
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
7-
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) --pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommand>
7+
<BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
8+
9+
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
10+
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
11+
12+
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
813
<OrchestratedManifestBuildName>dotnet/sdk</OrchestratedManifestBuildName>
914
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
1015
<NuGetConfigFile>$(ProjectDirectory)/nuget.config</NuGetConfigFile>
1116
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
17+
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
1218
<UsesRepoToolset>true</UsesRepoToolset>
1319

1420
<!-- ProdCon is behind source-build: temporarily disable auto-update. -->

‎repos/symreader-portable.proj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) --pack --configuration $(Configuration)</BuildCommand>
5+
<BuildCommandArgs>--pack --configuration $(Configuration)</BuildCommandArgs>
6+
7+
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
8+
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
9+
10+
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
611
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
712
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
813
<NuGetConfigFile>$(ProjectDirectory)/nuget.config</NuGetConfigFile>
14+
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
915
<UsesRepoToolset>true</UsesRepoToolset>
1016
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
1117
</PropertyGroup>

‎repos/symreader.proj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) --pack --configuration $(Configuration)</BuildCommand>
5+
<BuildCommandArgs>--pack --configuration $(Configuration)</BuildCommandArgs>
6+
7+
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
8+
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
9+
10+
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
611
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
712
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
813
<NuGetConfigFile>$(ProjectDirectory)/nuget.config</NuGetConfigFile>
14+
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
915
<UsesRepoToolset>true</UsesRepoToolset>
1016
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
1117
</PropertyGroup>

0 commit comments

Comments
 (0)