Skip to content

Attempt to fix restore internal tools #2255

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
merged 3 commits into from
Jan 28, 2020
Merged

Attempt to fix restore internal tools #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cfab11
Force re-install of nuget authenticator
safern Jan 27, 2020
3a3e4ac
Update dotnet tools to latest daily build
safern Jan 27, 2020
66f8c36
Remove AddUntrackedResourcesForSourceLink workaround for sourcelink
safern Jan 28, 2020
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
1 change: 1 addition & 0 deletions eng/pipelines/common/restore-internal-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ steps:
- task: NuGetAuthenticate@0
inputs:
nuGetServiceConnections: 'dotnet-core-internal-tooling'
forceReinstallCredentialProvider: true

- task: DotNetCoreCLI@2
displayName: Restore internal tools
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
- _warnAsErrorArg: ''
- _testScopeArg: ''
- _extraHelixArguments: ''
- _crossBuildPropertyArg: ''

- librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

Expand Down
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 @@ -5,7 +5,7 @@
"rollForward": "major"
},
"tools": {
"dotnet": "5.0.100-alpha1-015772"
"dotnet": "5.0.100-alpha.1.20073.4"
},
"native-tools": {
"cmake": "3.14.2",
Expand Down
14 changes: 1 addition & 13 deletions src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<PropertyGroup>
<!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<CoreCompileDependsOn>$(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink</CoreCompileDependsOn>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -456,16 +455,5 @@

<Import Project="CreateRuntimeRootILLinkDescriptorFile.targets" />

<Target Name="CreateRuntimeRootIlLinkDescFile" BeforeTargets="CoreCompile" DependsOnTargets="_CreateILLinkRuntimeRootDescriptorFile">
</Target>

<!-- This is working around dotnet/coreclr#26371 until dotnet/sourcelink#392 gets solved -->
<Target Name="AddUntrackedResourcesForSourceLink"
Condition="'$(BuildingInsideVisualStudio)' != 'true'"
BeforeTargets="CoreCompile"
DependsOnTargets="SetEmbeddedFilesFromSourceControlManagerUntrackedFiles;_GenerateResxSource" >
<ItemGroup>
<EmbeddedFiles Include="@(GeneratedResxSource)" />
</ItemGroup>
</Target>
<Target Name="CreateRuntimeRootIlLinkDescFile" BeforeTargets="CoreCompile" DependsOnTargets="_CreateILLinkRuntimeRootDescriptorFile"/>
</Project>
1 change: 0 additions & 1 deletion src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
<PropertyGroup>
<!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<CoreCompileDependsOn>$(CoreCompileDependsOn);AddUntrackedResourcesForSourceLink</CoreCompileDependsOn>
</PropertyGroup>

<!--
Expand Down