Skip to content

Commit

Permalink
fixesss
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorHofer authored Dec 17, 2024
1 parent a52143f commit 70ec9db
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@

<!--
Packages that aren't matched above as RID-specific are considered RID-agnostic. Also include
the AllConfigurations packages from the Libraries build.
the packages from the Libraries build.
-->
<RidAgnosticNupkgToPublishFile
Include="
$(DownloadDirectory)**\Microsoft.NET.Workload.Mono.Toolchain.*Manifest-*.nupkg;
$(DownloadDirectory)**\Microsoft.NET.Sdk.WebAssembly.Pack.*.nupkg;
$(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromPlatform)\**\*.nupkg;
$(DownloadDirectory)*\*AllConfigurations\**\*.nupkg"
$(DownloadDirectory)*\Libraries_WithPackages\**\*.nupkg"
Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />

<TransportPackagesToPublishFile
Expand Down
4 changes: 2 additions & 2 deletions eng/packaging.targets
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
<BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack>

<!-- Generate packages for rid specific projects. -->
<!-- Generate packages for rid specific projects when not in runtimelab (to avoid binclashes when using the same feed). -->
<IsRIDSpecificProject Condition="$(MSBuildProjectName.StartsWith('runtime.')) and
!$(MSBuildProjectName.StartsWith('runtime.native'))">true</IsRIDSpecificProject>
<GeneratePackageOnBuild Condition="'$(IsRIDSpecificProject)' == 'true'">true</GeneratePackageOnBuild>
<GeneratePackageOnBuild Condition="'$(IsRIDSpecificProject)' == 'true' and '$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>

<!-- During NoBuild pack invocations, skip project reference build. Necessary for the IncludeProjectReferencesWithPackAttributeInPackage target. -->
<BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/official/stages/publish.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
parameters:
PublishRidAgnosticPackagesFromPlatform: windows_x64
publishingInfraVersion: 3

stages:

Expand Down Expand Up @@ -28,7 +27,6 @@ stages:
# Stages-based publishing entry point
- template: /eng/common/templates-official/post-build/post-build.yml
parameters:
publishingInfraVersion: ${{ parameters.publishingInfraVersion }}
validateDependsOn:
- PrepareForPublish
# The following checks are run after the build in the validation and release pipelines
Expand Down

0 comments on commit 70ec9db

Please sign in to comment.