Skip to content

Commit

Permalink
remove redundant tasks
Browse files Browse the repository at this point in the history
update version

drop the 7.x

remove strongNameBypass2.reg
  • Loading branch information
Brent Schmaltz authored and brentschmaltz committed Jan 3, 2024
1 parent 4189db3 commit c3700a5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
37 changes: 11 additions & 26 deletions build/releaseBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,28 @@ jobs:

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core sdk 2.1.818'
displayName: 'Use .NET Core sdk 2.x'
inputs:
version: 2.1.818
installationPath: 'c:\Program Files\dotnet'

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 2.1.x'
inputs:
version: 2.1.x
version: 2.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: UseDotNet@2
displayName: 'Use .Net Core SDK 6'
displayName: 'Use .NET Core sdk 6.x'
inputs:
version: 6.0.x
version: 6.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: UseDotNet@2
displayName: 'Use .Net Core SDK 8'
displayName: 'Use .NET Core sdk 8.x'
inputs:
includePreviewVersions: true
version: 8.0.x
condition: eq(variables['TargetNet8'], 'True')
version: 8.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: DotNetCoreCLI@2
displayName: 'dotnet --list-sdks '
displayName: 'dotnet --list-sdks'
inputs:
command: custom
custom: '--list-sdks '
custom: '--list-sdks'

- task: CmdLine@1
displayName: 'Run VerifyResourceUsage.pl'
Expand All @@ -67,7 +61,6 @@ jobs:

- powershell: |
regedit /s .\build\strongNameBypass.reg
regedit /s .\build\strongNameBypass2.reg
displayName: 'Strong Name Bypass'
- task: PowerShell@2
Expand All @@ -77,21 +70,13 @@ jobs:
filePath: ./updateAssemblyInfo.ps1
arguments: '-packageType $(BuildConfiguration)'

# - task: MSBuild@1
# displayName: Build
# inputs:
# solution: wilson.sln
# msbuildArchitecture: x64
# msbuildArguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true /p:RunApiCompat=true'

- task: DotNetCoreCLI@2
displayName: Build
inputs:
command: 'custom'
projects: 'wilson.sln'
custom: 'msbuild'
arguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true'
# arguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true /p:RunApiCompat=true'

- task: PowerShell@2
displayName: 'Run Tests'
Expand Down Expand Up @@ -148,7 +133,7 @@ jobs:


#Sign Wilson 7x task group
- template: template-sign-wilson-7x.yaml
- template: template-sign-wilson.yaml

- task: PowerShell@2
displayName: Pack
Expand Down
Binary file removed build/strongNameBypass2.reg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#template sign-wilson-7x
#template sign-wilson

parameters:
BuildConfiguration: 'release'
Expand All @@ -18,4 +18,4 @@ steps:
displayName: 'Verify Signing'
inputs:
scriptName: build/VerifySigning.ps1
arguments: '-buildType ${{ parameters.BuildConfiguration }}'
arguments: '-buildType ${{ parameters.BuildConfiguration }}'
2 changes: 1 addition & 1 deletion buildConfiguration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<dotnetArchitecture>x64</dotnetArchitecture>
<nugetVersion>3.5.0-rc-1285</nugetVersion>
<runtimes>net461,netstandard2.0</runtimes>
<assemblyVersion>7.0.3</assemblyVersion>
<assemblyVersion>7.0.4</assemblyVersion>
<nugetSuffix>preview</nugetSuffix>
<projects>
<src>
Expand Down

0 comments on commit c3700a5

Please sign in to comment.