diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-12-28 19:33:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 19:33:57 +0300 |
| commit | 75d5cc3df4dde3b37d75f289b5a90e358da838aa (patch) | |
| tree | ed75d388304564efae902a969fb526876471ec9a /eng/restore | |
| parent | c142f162854185ba45f0fab678f8b28d1add3968 (diff) | |
Avoid deferred Arcade importing (#46397)
* General cleanup and mono import Arcade in root
* More cleanup and coreclr import Arcade root
* Import Arcade root from libraries
* Set informationversion for corelib
* BuildArchitecture cleanup
* Fix property name
* Fix default target invocation of runtime.proj
* specify tfm correctly
* Remove unnecessary TestStrongNameKeyId
* Revert TestStrongNameKeyId removal
* Fix entrypoint target by using M.B.NoTargets
* Fix reference assembly paths
* PR feedback
* Set Platform correctly
* PR feedback and more cleanup
* Move BaselineMicrosoftNetCoreAppPackageVersion
* Fix reference to CoreLib
* Fix OS calculation
* Fix targets importing
* Remove *TargetOS
* Add RuntimeConfiguration doc
* Change conditions in root msbuild files
* installer test fixes
* Cleanup
* More cleanup because of well defined entrypoint
* Don't import D.B.* from installer tests at all
* Rename fix
* Include explicit reference to mscorlib in ilproj
* Update eng/restore/docs.targets
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
* Revert some installer test changes
* Installer test fix again
* Disable EOL tfm check for installer tests
* Set platform later for installer
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Diffstat (limited to 'eng/restore')
| -rw-r--r-- | eng/restore/docs.targets | 4 | ||||
| -rw-r--r-- | eng/restore/optimizationData.targets | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets index 072564d9ac7..764bc5bbefb 100644 --- a/eng/restore/docs.targets +++ b/eng/restore/docs.targets @@ -1,7 +1,7 @@ <Project> <ItemGroup> - <PackageDownload Include="$(MicrosoftPrivateIntellisensePackage)" Version="[$(MicrosoftPrivateIntellisenseVersion)]" /> + <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" /> </ItemGroup> <!-- the intellisense package doesn't use nuget conventions so we need to select manually --> @@ -43,4 +43,4 @@ </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index a8466b7cd0c..9b431aa953a 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,10 +1,10 @@ <Project> <ItemGroup> - <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxVersion)" /> - <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackage)" Version="$(optimizationlinuxx64IBCCoreFxVersion)" /> - <IBCPackage Include="$(WindowsOptimizationIBCCoreCLRPackage)" Version="$(optimizationwindows_ntx64IBCCoreCLRVersion)" /> - <IBCPackage Include="$(LinuxOptimizationIBCCoreCLRPackage)" Version="$(optimizationlinuxx64IBCCoreCLRVersion)" /> + <IBCPackage Include="optimization.windows_nt-x64.ibc.corefx" Version="$(optimizationwindows_ntx64IBCCoreFxVersion)" /> + <IBCPackage Include="optimization.linux-x64.ibc.corefx" Version="$(optimizationlinuxx64IBCCoreFxVersion)" /> + <IBCPackage Include="optimization.windows_nt-x64.IBC.CoreCLR" Version="$(optimizationwindows_ntx64IBCCoreCLRVersion)" /> + <IBCPackage Include="optimization.linux-x64.IBC.CoreCLR" Version="$(optimizationlinuxx64IBCCoreCLRVersion)" /> <PackageDownload Include="@(IBCPackage)" Version="[%(Version)]" /> </ItemGroup> |