Skip to content

Add a flag to enable NuGet.org README.md display #21157

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
pakrym merged 17 commits into from
Jun 21, 2021
Merged

Add a flag to enable NuGet.org README.md display #21157

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cd78d63
Add a flag to enable NuGet.org README.md display
pakrym May 18, 2021
c31ec2e
SDK
pakrym May 18, 2021
0963580
includePreviewVersions
pakrym May 18, 2021
3beea40
Update install-dotnet.yml
pakrym May 18, 2021
51959f0
try again
pakrym May 26, 2021
65d103d
Merge remote-tracking branch 'azure/master' into feature/readmemd
pakrym May 26, 2021
90dba79
==
pakrym May 26, 2021
e4f5f1a
more
pakrym Jun 8, 2021
06ec4ef
Merge branch 'master' into feature/readmemd
pakrym Jun 8, 2021
a12cf57
works
pakrym Jun 8, 2021
80d6e17
now it works
pakrym Jun 8, 2021
0f7bf41
all
pakrym Jun 9, 2021
eb28ec8
sleep makes everything better
pakrym Jun 9, 2021
e614e63
gb
pakrym Jun 10, 2021
1020a85
fb
pakrym Jun 10, 2021
6726b3e
Merge remote-tracking branch 'azure/main' into feature/readmemd
pakrym Jun 21, 2021
81e2135
Merge remote-tracking branch 'azure/main' into feature/readmemd
pakrym Jun 21, 2021
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
5 changes: 5 additions & 0 deletions eng/Directory.Build.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
<None Condition="Exists('$(MSBuildProjectDirectory)/../README.md')" Include="$(MSBuildProjectDirectory)/../README.md" Pack="true" PackagePath=""/>
</ItemGroup>

<!-- Add Enable README.md display -->
<PropertyGroup Condition="'$(EnableExperimentalNuGetReadmeMd)' != 'true'">
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<!-- Add App.config to enable server GC in net461 perf and stress projects -->
<ItemGroup Condition="('$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true') and '$(TargetFramework)' == 'net461'">
<None Include="$(RepoRoot)/common/PerfStressShared/App.config" />
Expand Down
5 changes: 3 additions & 2 deletions eng/pipelines/templates/steps/install-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK'
inputs:
useGlobalJson: true
version: 5.0.x
performMultiLevelLookup: true
includePreviewVersions: true
- task: UseDotNet@2
condition: ne(variables['Agent.OS'], 'Windows_NT') # Windows supports MultiLevelLookup and doesn't need explicit framework installation
displayName: 'Use .NET Core 2.1 runtime'
Expand All @@ -23,4 +24,4 @@ steps:
nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props
nuget | "$(Agent.OS)"
path: $(NUGET_PACKAGES)
displayName: Cache NuGet packages
displayName: Cache NuGet packages
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Microsoft.Build.Traversal": "1.0.45"
},
"sdk": {
"version": "5.0.200",
"version": "5.0.300-preview.21180.15",
"rollForward": "feature"
}
}
1 change: 1 addition & 0 deletions sdk/template/Azure.Template/src/Azure.Template.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Version>1.0.3-beta.19</Version>
<PackageTags>Azure Template</PackageTags>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<EnableExperimentalNuGetReadmeMd>true</EnableExperimentalNuGetReadmeMd>
</PropertyGroup>

<ItemGroup>
Expand Down