Skip to content

Commit 31124e7

Browse files
committed
Merged PR 10518840: Update version.
Update version. Include pipeline sync to github PS - Removed a deprecated package (Microsoft.DotNet.Analyzers.Compatibility) from the sample application
1 parent a7b5f90 commit 31124e7

File tree

5 files changed

+48
-20
lines changed

5 files changed

+48
-20
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: $(date:yyyyMMdd)$(rev:.r)
2+
variables:
3+
- name: system.debug
4+
value: false
5+
- group: Access Tokens
6+
- group: Azure Account
7+
resources:
8+
repositories:
9+
- repository: 1esPipelines
10+
type: git
11+
name: 1ESPipelineTemplates/1ESPipelineTemplates
12+
ref: refs/tags/release
13+
- repository: mainPipelines
14+
type: git
15+
name: WindowsProtocolTestSuites/ProtocolTestFramework
16+
ref: AzurePipelines-main
17+
trigger:
18+
branches:
19+
include:
20+
- refs/heads/main
21+
batch: true
22+
extends:
23+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
24+
parameters:
25+
pool:
26+
os: windows
27+
image: windows-2019
28+
name: Azure-Pipelines-1ESPT-ExDShared
29+
customBuildTags:
30+
- MigrationTooling-microsoft-WindowsProtocolTestSuites-53147-Tool
31+
stages:
32+
- stage: Stage
33+
jobs:
34+
- job: SyncToGithub
35+
displayName: Sync to Github
36+
steps:
37+
- template: pipelines/1es/PTFMainSyncToGitHub-steps.yml@mainPipelines
38+

samples/XXXX_ProtocolTestSuite/XXXX_Adapter/XXXX_Adapter.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AssemblyName>XXXX_Adapter</AssemblyName>
55
<RootNamespace>Microsoft.Protocols.TestSuites.XXXX.Adapter</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
<PrivateAssets>all</PrivateAssets>
12-
</PackageReference>
13-
</ItemGroup>
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Protocols.TestTools" Version="2.4.0" />
9+
<PackageReference Include="Microsoft.Protocols.TestTools" Version="2.5.0" />
1610
</ItemGroup>
1711
<ItemGroup>
1812
<None Update="XXXX_SUTControlAdapter\ResetSUT.ps1">

samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<RootNamespace>Microsoft.Protocols.TestSuites.XXXX.TestSuite</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -16,15 +16,11 @@
1616
<StartupObject />
1717
</PropertyGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2420
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
25-
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
26-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
27-
<PackageReference Include="Microsoft.Protocols.TestTools" Version="2.4.0" />
21+
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
23+
<PackageReference Include="Microsoft.Protocols.TestTools" Version="2.5.0" />
2824
</ItemGroup>
2925
<ItemGroup>
3026
<ProjectReference Include="..\XXXX_Adapter\XXXX_Adapter.csproj" />

src/SharedAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
using System.Reflection;
55

66
[assembly: AssemblyCompany("Microsoft")]
7-
[assembly: AssemblyVersion("2.4.0")]
8-
[assembly: AssemblyFileVersion("2.4.0.0")]
7+
[assembly: AssemblyVersion("2.5.0")]
8+
[assembly: AssemblyFileVersion("2.5.0.0")]
99
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]

src/TestFramework/TestFramework.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Microsoft.Protocols.TestTools</id>
5-
<version>2.4.0</version>
5+
<version>2.5.0</version>
66
<title>Protocol Test Framework</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>

0 commit comments

Comments
 (0)