Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
</packageSources>
<!-- We don't want other than VS OpenTelemetry libraries from vs-impl -->
<packageSourceMapping>
<packageSource key="vs-impl">
<package pattern="Microsoft.VisualStudio.OpenTelemetry*" />
</packageSource>
<packageSource key="arcade">
<package pattern="*" />
</packageSource>
Expand Down
10 changes: 1 addition & 9 deletions THIRDPARTYNOTICES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,4 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License.

-------------------------------

Notice for Microsoft.VisualStudio.OpenTelemetry.*
-------------------------------
MSBuild.exe is distributed with Microsoft.VisualStudio.OpenTelemetry.* binaries.

Project: Microsoft.VisualStudio.OpenTelemetry
Copyright: (c) Microsoft Corporation
License: https://visualstudio.microsoft.com/license-terms/mt736442/
-------------------------------
4 changes: 1 addition & 3 deletions eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />

<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
<!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftVisualStudioOpenTelemetryVersion>0.2.104-beta</MicrosoftVisualStudioOpenTelemetryVersion>
<MicrosoftVisualStudioTelemetryVersion>17.14.18</MicrosoftVisualStudioTelemetryVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this match version in VS? how do we coordinate changes?

<!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
</PropertyGroup>
<!-- Toolset Dependencies -->
Expand Down
5 changes: 1 addition & 4 deletions src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
<PackageReference Include="NuGet.Frameworks">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

<PackageReference Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
<PackageReference Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />


<ProjectReference Include="..\Build\Microsoft.Build.csproj" />
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
<ProjectReference Include="..\MSBuild\MSBuild.csproj" />
Expand Down
195 changes: 0 additions & 195 deletions src/Build.UnitTests/Telemetry/OpenTelemetryActivities_Tests.cs

This file was deleted.

142 changes: 0 additions & 142 deletions src/Build.UnitTests/Telemetry/OpenTelemetryManager_Tests.cs

This file was deleted.

Loading
Loading