Skip to content

Commit 68bd10d

Browse files
HaploisHaplois
authored
Removed ProfilerProxy.dll (#3069)
1 parent fd2827e commit 68bd10d

File tree

6 files changed

+12
-19
lines changed

6 files changed

+12
-19
lines changed

‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1515
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1616
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
17-
<add key="vssdk@Local" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk%40Local/nuget/v3/index.json" />
17+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
1818
</packageSources>
1919
<fallbackPackageFolders>
2020
<clear />

‎scripts/build.ps1

+9-5
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ if([string]::IsNullOrWhiteSpace($Version))
7373
#
7474
Write-Verbose "Setup build configuration."
7575
$TPB_Solution = "TestPlatform.sln"
76-
$TPB_TestAssets_Solution = Join-Path $env:TP_ROOT_DIR "test\TestAssets\TestAssets.sln"
77-
$TPB_TestAssets_CILAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\CILProject\CILProject.proj"
76+
$TPB_TestAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\"
77+
$TPB_TestAssets_Solution = Join-Path $TPB_TestAssets "TestAssets.sln"
78+
$TPB_TestAssets_CILAssets = Join-Path $TPB_TestAssets "CILProject\CILProject.proj"
7879
$TPB_TargetFramework45 = "net45"
7980
$TPB_TargetFramework451 = "net451"
8081
$TPB_TargetFramework472 = "net472"
@@ -138,10 +139,16 @@ function Invoke-TestAssetsBuild
138139
$timer = Start-Timer
139140
Write-Log "Invoke-TestAssetsBuild: Start test assets build."
140141
$dotnetExe = Get-DotNetPath
142+
$nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe"
143+
$nugetConfig = Join-Path $TPB_TestAssets "NuGet.config"
141144

142145
Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution"
146+
Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- add NuGet source"
147+
& $nugetExe sources add -Name "locally-built-testplatform-packages" -Source "$env:TP_TESTARTIFACTS\packages\" -ConfigFile "$nugetConfig"
143148
Write-Verbose "$dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild"
144149
& $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:"$($env:TP_ROOT_DIR)\TestAssets.binlog"
150+
Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- remove NuGet source"
151+
& $nugetExe sources remove -Name "locally-built-testplatform-packages" -ConfigFile "$nugetConfig"
145152
Write-Log ".. .. Build: Complete."
146153

147154
Set-ScriptFailedOnError
@@ -892,9 +899,6 @@ function Get-CoreCLR20TestHostPackageDirectory
892899
return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20\TestHost")
893900
}
894901

895-
896-
897-
898902
function Locate-MSBuildPath
899903
{
900904
$vsInstallPath = Locate-VsInstallPath

‎scripts/verify-nupkgs.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
1414
$expectedNumOfFiles = @{
1515
"Microsoft.CodeCoverage" = 59;
1616
"Microsoft.NET.Test.Sdk" = 27;
17-
"Microsoft.TestPlatform" = 484;
17+
"Microsoft.TestPlatform" = 474;
1818
"Microsoft.TestPlatform.Build" = 21;
1919
"Microsoft.TestPlatform.CLI" = 367;
2020
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;

‎src/package/external/external.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Reference Include="Microsoft.CSharp" />
3030
</ItemGroup>
3131

32-
<ItemGroup>
32+
<ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
3333
<!-- This csproj restore external tools required for build process -->
3434
<PackageReference Include="NuGet.CommandLine" Version="5.8.1" PrivateAssets="All" />
3535
<PackageReference Include="fmdev.xlftool" Version="0.1.3" PrivateAssets="All" />

‎src/package/nuspec/Microsoft.TestPlatform.nuspec

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@
6262
<file src="net451\$Runtime$\Microsoft.DiaSymReader.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.DiaSymReader.dll" />
6363
<file src="net451\$Runtime$\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
6464
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" />
65-
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\concrt140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\concrt140.dll" />
66-
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\Microsoft.IntelliTrace.ProfilerProxy.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\Microsoft.IntelliTrace.ProfilerProxy.dll" />
67-
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\msvcp140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\msvcp140.dll" />
68-
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\vccorlib140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\vccorlib140.dll" />
69-
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\vcruntime140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\amd64\vcruntime140.dll" />
70-
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\concrt140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\concrt140.dll" />
71-
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\Microsoft.IntelliTrace.ProfilerProxy.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\Microsoft.IntelliTrace.ProfilerProxy.dll" />
72-
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\msvcp140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\msvcp140.dll" />
73-
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vccorlib140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vccorlib140.dll" />
74-
<file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vcruntime140.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProfilerProxy\x86\vcruntime140.dll" />
7565
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" />
7666
<file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" />
7767

‎test/TestAssets/NuGet.config

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</packageRestore>
66
<packageSources>
77
<clear />
8-
<add key="locally-built-testplatform-packages" value="..\..\artifacts\testArtifacts\packages"/>
98
<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
109
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1110
</packageSources>

0 commit comments

Comments
 (0)