Skip to content

Commit

Permalink
Merge pull request #958 from microsoft/dev/andarno/libtemplateUpdate
Browse files Browse the repository at this point in the history
Merge latest Library.Template
  • Loading branch information
AArnott authored Jun 12, 2023
2 parents d18600d + 921fca3 commit 814dd2b
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 28 deletions.
9 changes: 9 additions & 0 deletions .azuredevops/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Please see the documentation for all configuration options:
# https://eng.ms/docs/products/dependabot/configuration/version_updates

version: 2
updates:
- package-ecosystem: nuget
directory: /
schedule:
interval: monthly
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
]
},
"dotnet-coverage": {
"version": "17.7.0",
"version": "17.7.1",
"commands": [
"dotnet-coverage"
]
},
"nbgv": {
"version": "3.6.128",
"version": "3.6.133",
"commands": [
"nbgv"
]
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy
FROM mcr.microsoft.com/dotnet/sdk:7.0.302-jammy

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: nuget
directory: /
schedule:
interval: monthly
interval: weekly
ignore:
- dependency-name: MessagePack # We have to use the MessagePack version used by win32metadata (https://github.com/microsoft/CsWin32/issues/371)
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersion)" />
<!-- <PackageVersion Include="Microsoft.Dia.Win32Metadata" Version="0.2.185-preview-g7e1e6a442c" /> -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="Microsoft.Windows.SDK.Win32Docs" Version="$(ApiDocsVersion)" />
<PackageVersion Include="Microsoft.Windows.SDK.Win32Metadata" Version="$(MetadataVersion)" />
Expand All @@ -46,9 +46,9 @@
<PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.329" />
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.495" />
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.128" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
<GlobalPackageReference Include="Nullable" Version="1.3.1" />
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ parameters:
default: true

variables:
MSBuildTreatWarningsAsErrors: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
BuildConfiguration: Release
# #codecov_token: # Get a new one from https://codecov.io/
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/Archive-SourceCode.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ if (!$Requester) {
$Requester = $env:USERNAME
}
if (!$Requester) {
Write-Error "Unable to determine default value for -Requester."
$Requester = $OwnerAlias
}
}

Expand Down
3 changes: 2 additions & 1 deletion azure-pipelines/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ parameters:
RunTests:

steps:
- script: dotnet build /t:build --no-restore -c $(BuildConfiguration) /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"

- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnaserror /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
displayName: 🛠 dotnet build

- ${{ if eq(variables['system.collectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines/official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ stages:

- stage: Build
variables:
MSBuildTreatWarningsAsErrors: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
BuildConfiguration: Release
NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
Expand Down
11 changes: 4 additions & 7 deletions azure-pipelines/prepare-insertion-stages.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
parameters:
- name: ArchiveSymbols
type: boolean
default: true

stages:

- stage: azure_public_winsdk_feed
displayName: azure-public/winsdk feed
- stage: release
displayName: Publish
condition: and(succeeded(), eq(dependencies.Build.outputs['Windows.SetPipelineVariables.IsSigned'], 'true'))
jobs:
- job: push
displayName: azure-public/winsdk feed
pool:
vmImage: ubuntu-latest
steps:
Expand All @@ -28,3 +24,4 @@ stages:
nuGetServiceConnections: azure-public/winsdk
forceReinstallCredentialProvider: true
- script: dotnet nuget push $(Pipeline.Workspace)/deployables-Windows/*.nupkg -s https://pkgs.dev.azure.com/azure-public/winsdk/_packaging/CI/nuget/v3/index.json --api-key azdo --skip-duplicate
displayName: 📦 Push nuget packages
2 changes: 0 additions & 2 deletions azure-pipelines/vs-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ stages:
RunTests: false

- template: prepare-insertion-stages.yml
parameters:
ArchiveSymbols: false

- stage: insertion
displayName: VS insertion
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.203",
"version": "7.0.302",
"rollForward": "patch",
"allowPrerelease": false
}
Expand Down
12 changes: 6 additions & 6 deletions init.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ Push-Location $PSScriptRoot
try {
$HeaderColor = 'Green'

if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) {
$RestoreArguments = @()
if ($Interactive)
{
$RestoreArguments += '--interactive'
}
$RestoreArguments = @()
if ($Interactive)
{
$RestoreArguments += '--interactive'
}

if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) {
Write-Host "Restoring NuGet packages" -ForegroundColor $HeaderColor
dotnet restore @RestoreArguments
if ($lastexitcode -ne 0) {
Expand Down

0 comments on commit 814dd2b

Please sign in to comment.