Update pgo data versions, and remove excess nuget details handling old ibc data (#52082)

e3db83fd · David Wrighton · GitHub · 6aca7afd · e3db83fd · e3db83fd
隐藏空白更改
内联并排

Showing with 20 addition and 64 deletion

eng/Version.Details.xml eng/Version.Details.xml +16 -20

eng/Versions.props eng/Versions.props +4 -8

eng/restore/optimizationData.targets eng/restore/optimizationData.targets +0 -36

未找到文件。
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -70,26 +70,6 @@
      <Uri>https://github.com/dotnet/arcade</Uri>
      <Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
    </Dependency>
-    <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>f69d7fc09c4fdb9e9427741b9a176e867dab577f</Sha>
-    </Dependency>
-    <Dependency Name="optimization.linux-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>f69d7fc09c4fdb9e9427741b9a176e867dab577f</Sha>
-    </Dependency>
-    <Dependency Name="optimization.windows_nt-x64.IBC.CoreCLR" Version="99.99.99-master-20200806.6">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>f69d7fc09c4fdb9e9427741b9a176e867dab577f</Sha>
-    </Dependency>
-    <Dependency Name="optimization.linux-x64.IBC.CoreCLR" Version="99.99.99-master-20200806.6">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>f69d7fc09c4fdb9e9427741b9a176e867dab577f</Sha>
-    </Dependency>
-    <Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20210420.2">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>f69d7fc09c4fdb9e9427741b9a176e867dab577f</Sha>
-    </Dependency>
    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
      <Uri>https://github.com/microsoft/vstest</Uri>
      <Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
@@ -210,5 +190,21 @@
      <Uri>https://github.com/dotnet/arcade</Uri>
      <Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
    </Dependency>
+    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21228.9">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>511fc23bc9dc22f6d7c0d2433e936c5db6a1a797</Sha>
+    </Dependency>
+    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21228.9">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>511fc23bc9dc22f6d7c0d2433e936c5db6a1a797</Sha>
+    </Dependency>
+    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21228.9">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>511fc23bc9dc22f6d7c0d2433e936c5db6a1a797</Sha>
+    </Dependency>
+    <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21228.9">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>511fc23bc9dc22f6d7c0d2433e936c5db6a1a797</Sha>
+    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -122,14 +122,10 @@
    <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21226.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
    <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21226.1</SystemWindowsExtensionsTestDataVersion>
    <!-- dotnet-optimization dependencies -->
-    <optimizationwindows_ntx64MIBCRuntimeVersion>99.99.99-master-20210415.12</optimizationwindows_ntx64MIBCRuntimeVersion>
-    <optimizationwindows_ntx86MIBCRuntimeVersion>99.99.99-master-20210415.12</optimizationwindows_ntx86MIBCRuntimeVersion>
-    <optimizationlinuxx64MIBCRuntimeVersion>99.99.99-master-20210415.12</optimizationlinuxx64MIBCRuntimeVersion>
-    <optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationwindows_ntx64IBCCoreFxVersion>
-    <optimizationlinuxx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationlinuxx64IBCCoreFxVersion>
-    <optimizationwindows_ntx64IBCCoreCLRVersion>99.99.99-master-20200806.6</optimizationwindows_ntx64IBCCoreCLRVersion>
-    <optimizationlinuxx64IBCCoreCLRVersion>99.99.99-master-20200806.6</optimizationlinuxx64IBCCoreCLRVersion>
-    <optimizationPGOCoreCLRVersion>99.99.99-master-20210420.2</optimizationPGOCoreCLRVersion>
+    <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21228.9</optimizationwindows_ntx64MIBCRuntimeVersion>
+    <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21228.9</optimizationwindows_ntx86MIBCRuntimeVersion>
+    <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21228.9</optimizationlinuxx64MIBCRuntimeVersion>
+    <optimizationPGOCoreCLRVersion>1.0.0-prerelease.21228.9</optimizationPGOCoreCLRVersion>
    <!-- Not auto-updated. -->
    <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
    <SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>

--- a/eng/restore/optimizationData.targets
+++ b/eng/restore/optimizationData.targets
 <Project>
-
-  <ItemGroup>
-    <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>
-
-  <!-- IBC data packages don't follow NuGet conventions.  -->
-  <Target Name="GetIBCData"
-          AfterTargets="Restore">
-
-    <ItemGroup>
-      <IBCPackage>
-        <PackagePath>$(NuGetPackageRoot)%(IBCPackage.Identity)\%(IBCPackage.Version)</PackagePath>
-      </IBCPackage>
-      <IBCPackage Condition="$([System.String]::new('%(Identity)').ToLower().Contains('windows_nt'))">
-        <SubdirectoryName>Windows</SubdirectoryName>
-      </IBCPackage>
-      <IBCPackage Condition="$([System.String]::new('%(Identity)').ToLower().Contains('linux'))">
-        <SubdirectoryName>Linux</SubdirectoryName>
-      </IBCPackage>
-      <_optimizationDataSourceFile Include="%(IBCPackage.PackagePath)\**\*.dll;%(IBCPackage.PackagePath)\**\*.ibc" SubdirectoryName="%(IBCPackage.SubdirectoryName)" />
-    </ItemGroup>
-
-    <Error Condition="'@(_optimizationDataSourceFile)' == ''" Text="Failed to restore optimization data" />
-
-    <Copy SourceFiles="@(_optimizationDataSourceFile)"
-          DestinationFiles="@(_optimizationDataSourceFile->'$(IbcOptimizationDataDir)%(SubdirectoryName)\%(RecursiveDir)%(Filename)%(Extension)')"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-  </Target>
-
-
  <ItemGroup>
    <!-- Mibc data to use when exact architecture match is available -->
    <MIBCPackageDef Include="optimization.windows_nt-x86.mibc.runtime" Version="$(optimizationwindows_ntx86MIBCRuntimeVersion)" MibcArchitecture="Windows/x86"/>