Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Switch from BuildTools packaging to Arcade packaging #32901

Merged
ericstj merged 2 commits into from
Oct 19, 2018
Merged

Switch from BuildTools packaging to Arcade packaging #32901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5454ff4
Switch from BuildTools packaging to Arcade packaging
ericstj Oct 18, 2018
7a74114
Ensure bootstrapping arcade succeeds when dotnet-core feed is disabled
ericstj Oct 18, 2018
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: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
<ExcludePartialFacadesImport>true</ExcludePartialFacadesImport>
<ExcludeApiCompatImport>true</ExcludeApiCompatImport>
<ExcludeReferenceAssembliesImport>true</ExcludeReferenceAssembliesImport>
<ExcludePackagingImport>true</ExcludePackagingImport>
<ExcludePackageLibsImport>true</ExcludePackageLibsImport>
</PropertyGroup>

<!-- Import Build tools common props file where repo-independent properties are found -->
Expand Down
3 changes: 3 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@
<clear/>
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Copy link
Member

@joperezr joperezr Oct 18, 2018

Choose a reason for hiding this comment

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

NIT: Should we add a comment in here of why this is needed?

</disabledPackageSources>
</configuration>
1 change: 1 addition & 0 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<PackageReference Include="$(MicrosoftDotNetApiCompatPackage)" Version="$(MicrosoftDotNetApiCompatPackageVersion)" />
<PackageReference Include="$(MicrosoftDotNetGenApiPackage)" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
<PackageReference Include="$(MicrosoftDotNetGenFacadesPackage)" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
<PackageReference Include="$(MicrosoftDotNetBuildTasksPackagingPackage)" Version="$(MicrosoftDotNetBuildTasksPackagingPackageVersion)" />
</ItemGroup>

<Target Name="InitTools" AfterTargets="Restore">
Expand Down
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>21d6319e08e25ea14ec0f72fef8d19e5d6b2cc34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.18518.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f0c64a007f619f8fcb825294433a36a478b3a920</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
<MicrosoftDotNetGenApiPackage>Microsoft.DotNet.GenAPI</MicrosoftDotNetGenApiPackage>
<MicrosoftDotNetGenFacadesPackage>Microsoft.DotNet.GenFacades</MicrosoftDotNetGenFacadesPackage>
<MicrosoftDotNetXUnitExtensionsPackage>Microsoft.DotNet.XUnitExtensions</MicrosoftDotNetXUnitExtensionsPackage>
<MicrosoftDotNetBuildTasksPackagingPackage>Microsoft.DotNet.Build.Tasks.Packaging</MicrosoftDotNetBuildTasksPackagingPackage>
Copy link
Member

@weshaggard weshaggard Oct 18, 2018

Choose a reason for hiding this comment

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

I know you are just following convention but we might want to reconsider the package name duplication now if the only place the name is used is in Tools.props.

</PropertyGroup>
<!-- Package versions -->
<PropertyGroup>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.18478.5</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetGenApiPackageVersion>1.0.0-beta.18478.5</MicrosoftDotNetGenApiPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.18478.5</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.18506.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.18518.2</MicrosoftDotNetBuildTasksPackagingPackageVersion>
</PropertyGroup>
</Project>