Skip to content

Commit 514c3ee

Browse files
authored
Update SBRP to version with updated TargetingPacks (#1672)
* Update SBRP to version with updated TargetingPacks * Update version in Version.Details.xml, also * Condition il build based on source existing * Update spacing * Update to latest version of SBRP
1 parent 3b7e22f commit 514c3ee

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Uri>https://github.com/dotnet/arcade</Uri>
66
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
77
</Dependency>
8-
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20278.2">
8+
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20374.1">
99
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
10-
<Sha>f3db8b2a4a7c12ac44283b516dac8cda12a5edeb</Sha>
10+
<Sha>a5e56cf0c92548d81ee8e3a680e6229807c93580</Sha>
1111
</Dependency>
1212
</ToolsetDependencies>
1313
<ProductDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<!-- Production Dependencies -->
99
<PropertyGroup>
10-
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20278.2</PrivateSourceBuildReferencePackagesPackageVersion>
10+
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
1111
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.105.1</PrivateSourceBuiltArtifactsPackageVersion>
1212
</PropertyGroup>
1313
</Project>

tools-local/init-build.proj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,14 @@
110110
<ReferenceAssemblyDirectories Include ="$(ReferencePackagesStagingDir)/**/*.nuspec" />
111111
</ItemGroup>
112112

113-
<MakeDir Directories="$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)" />
114-
<Exec Command="$(IlasmPath) %(IlSource.Identity) -dll -quiet -nologo -output=$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)%(IlSource.Filename).dll" />
113+
<MakeDir Condition="'%(IlSource.RecursiveDir)' != ''" Directories="$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)" />
114+
<Exec Condition="'%(IlSource.Identity)' != ''" Command="$(IlasmPath) %(IlSource.Identity) -dll -quiet -nologo -output=$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)%(IlSource.Filename).dll" />
115115

116116
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done building reference-only assemblies." />
117117

118118
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Packing reference-only packages." />
119-
<NugetPack Nuspecs="%(ReferenceAssemblyDirectories.Identity)"
119+
<NugetPack Condition="'%(ReferenceAssemblyDirectories.Identity)' != ''"
120+
Nuspecs="%(ReferenceAssemblyDirectories.Identity)"
120121
OutputDirectory="$(ReferencePackagesDir)"
121122
ExcludeEmptyDirectories="false"
122123
CreateSymbolPackage="false" />

0 commit comments

Comments
 (0)