Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…o feature/cdk
  • Loading branch information
JoshLove-msft committed Feb 22, 2024
2 parents acdfdbe + c0a9a60 commit 86f7702
Show file tree
Hide file tree
Showing 18,254 changed files with 872,662 additions and 156,847 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

# Catch all for loose files in the root, which are mostly global configuration and
# should not be changed without team discussion.
/* @jsquire @pallavit @JoshLove-msft @christothes @annelo-msft @KrzysztofCwalina
/* @jsquire @pallavit @Azure/azure-sdk-write-net-core

################
# Automation
Expand Down Expand Up @@ -57,7 +57,7 @@
# ######## Core Libraries ########

# PRLabel: %Azure.Core
/sdk/core/ @JoshLove-msft @christothes @annelo-msft @KrzysztofCwalina @jsquire
/sdk/core/ @Azure/azure-sdk-write-net-core

# PRLabel: %Azure.Identity
/sdk/identity/ @schaabs @christothes @Azure/azure-sdk-write-identity
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20231114.3
--version 1.0.0-dev.20240216.5
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20231114.3
--version 1.0.0-dev.20240216.5
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
26 changes: 14 additions & 12 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
<PackageReference Update="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Update="System.Globalization" Version="4.3.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
<PackageReference Update="System.Linq" Version="4.3.0" />
<PackageReference Update="System.Memory.Data" Version="1.0.2" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
Expand Down Expand Up @@ -106,19 +106,20 @@

<!-- Azure SDK packages -->
<PackageReference Update="Azure.Communication.Identity" Version="1.3.0" />
<PackageReference Update="Azure.Communication.Common" Version="1.2.1" />
<PackageReference Update="Azure.Communication.Common" Version="1.3.0" />
<PackageReference Update="Azure.Core" Version="1.37.0" />
<PackageReference Update="Azure.Core.Amqp" Version="1.3.0" />
<PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.32" />
<PackageReference Update="Azure.Core.Expressions.DataFactory" Version="1.0.0-beta.6" />
<PackageReference Update="Azure.Data.SchemaRegistry" Version="1.2.0" />
<PackageReference Update="Azure.Data.Tables" Version="12.8.0" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.10.0" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.11.0" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.21.0" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.17.1" />
<PackageReference Update="Azure.Messaging.WebPubSub" Version="1.2.0" />
<PackageReference Update="Azure.MixedReality.Authentication" version= "1.2.0" />
<PackageReference Update="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0-beta.1" />
<PackageReference Update="Azure.Monitor.OpenTelemetry.LiveMetrics" Version="1.0.0-beta.1" />
<PackageReference Update="Azure.Monitor.OpenTelemetry.LiveMetrics" Version="1.0.0-beta.2" />
<PackageReference Update="Azure.Monitor.Query" Version="1.1.0" />
<PackageReference Update="Azure.Identity" Version="1.10.4" />
<PackageReference Update="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
Expand Down Expand Up @@ -148,7 +149,7 @@
<PackageReference Update="Microsoft.Identity.Client.Broker" Version="4.56.0" />

<!-- TODO: Make sure this package is arch-board approved -->
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Monitor.OpenTelemetry'))">
Expand Down Expand Up @@ -230,19 +231,21 @@
<PackageReference Update="ApprovalUtilities" Version="3.0.22" />
<PackageReference Update="Azure.Identity" Version="1.10.4" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.17.0" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.11.0" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.16.0" />
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.2.0" />
<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.3.0" />
<PackageReference Update="Azure.ResourceManager.KeyVault" Version="1.1.0" />
<PackageReference Update="Azure.ResourceManager.ManagedServiceIdentities" Version="1.1.0" />
<PackageReference Update="Azure.ResourceManager.Network" Version="1.5.0" />
<PackageReference Update="Azure.ResourceManager.OperationalInsights" Version="1.1.0" />
<PackageReference Update="Azure.ResourceManager.PrivateDns" Version="1.0.1" />
<PackageReference Update="Azure.ResourceManager.RecoveryServices" Version="1.1.0" />
<PackageReference Update="Azure.ResourceManager.Resources" Version="1.6.0" />
<PackageReference Update="Azure.ResourceManager.Storage" Version="1.1.1" />
<PackageReference Update="Azure.ResourceManager.Kubernetes" Version="1.0.0-beta.3" />
<PackageReference Update="Azure.ResourceManager.KubernetesConfiguration" Version="1.2.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.ExtendedLocations" Version="1.1.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.Kubernetes" Version="1.0.0-beta.3" />
<PackageReference Update="Azure.ResourceManager.KubernetesConfiguration" Version="1.2.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.ExtendedLocations" Version="1.1.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.EventHubs" Version="1.0.0" />
<PackageReference Update="Azure.ResourceManager.ContainerRegistry" Version="1.1.0" />
<PackageReference Update="Azure.Search.Documents" Version="11.2.0" />
Expand Down Expand Up @@ -310,8 +313,7 @@
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.7, 2.0.0)" />
<PackageReference Update="Microsoft.ServiceFabric.Data" Version="3.3.624" />
<PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
<PackageReference Update="Moq" Version="[4.18.2]" />
<!-- This version should not be changed without team discussion. -->
<PackageReference Update="Moq" Version="[4.18.2]" /><!-- This version should not be changed without team discussion. -->
<PackageReference Update="MSTest.TestAdapter" Version="1.3.2" />
<PackageReference Update="MSTest.TestFramework" Version="1.3.2" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
Expand Down Expand Up @@ -350,4 +352,4 @@
<TestProxyVersion>1.0.0-dev.20230821.1</TestProxyVersion>
</PropertyGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ param (
[string] $Environment = 'AzureCloud',

[Parameter()]
[ValidateSet('test', 'perf')]
[ValidateSet('test', 'perf', 'stress-test')]
[string] $ResourceType = 'test',

[Parameter()]
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/codeowners-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stages:
vmImage: ubuntu-22.04

variables:
CodeownersLinterVersion: '1.0.0-dev.20231120.3'
CodeownersLinterVersion: '1.0.0-dev.20240216.3'
DotNetDevOpsFeed: "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
RepoLabelUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/repository-labels-blob"
TeamUserUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/azure-sdk-write-teams-blob"
Expand Down
73 changes: 73 additions & 0 deletions eng/common/scripts/typespec/New-EmitterPackageJson.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
[CmdletBinding()]
param (
[parameter(Mandatory = $true)]
[ValidateScript({ Test-Path $_ })]
[string]$PackageJsonPath,

[parameter(Mandatory = $false)]
[ValidateScript({ Test-Path $_ })]
[string]$OverridesPath,

[parameter(Mandatory = $true)]
[string]$OutputDirectory,

[parameter(Mandatory = $false)]
[string]$PackageJsonFileName = "emitter-package.json"
)

$packageJson = Get-Content $PackageJsonPath | ConvertFrom-Json -AsHashtable

# If we provide OverridesPath, use that to load a hashtable of version overrides
$overrides = @{}

if ($OverridesPath) {
Write-Host "Using overrides from $OverridesPath`:`n"
$overrides = Get-Content $OverridesPath | ConvertFrom-Json -AsHashtable
Write-Host ($overrides | ConvertTo-Json)
Write-Host ""
}


# If there's a peer dependency and a dev dependency for the same package, carry the
# dev dependency forward into emitter-package.json

$devDependencies = @{}

foreach ($package in $packageJson.peerDependencies.Keys) {
$pinnedVersion = $packageJson.devDependencies[$package]
if ($pinnedVersion -and -not $overrides[$package]) {
Write-Host "Pinning $package to $pinnedVersion"
$devDependencies[$package] = $pinnedVersion
}
}

$emitterPackageJson = [ordered]@{
"main" = "dist/src/index.js"
"dependencies" = @{
$packageJson.name = $overrides[$packageJson.name] ?? $packageJson.version
}
}

# you shouldn't specify the same package in both dependencies and overrides
$overrides.Remove($packageJson.name)

# Avoid adding an empty devDependencies section
if($devDependencies.Keys.Count -gt 0) {
$emitterPackageJson["devDependencies"] = $devDependencies
}

# Avoid adding an empty overrides section
if($overrides.Keys.Count -gt 0) {
$emitterPackageJson["overrides"] = $overrides
}

New-Item $OutputDirectory -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
$OutputDirectory = Resolve-Path $OutputDirectory

$dest = Join-Path $OutputDirectory $PackageJsonFileName
$destJson = $emitterPackageJson | ConvertTo-Json -Depth 100

Write-Host "Generating $dest"
$destJson | Out-File $dest

Write-Host $destJson
57 changes: 57 additions & 0 deletions eng/common/scripts/typespec/New-EmitterPackageLock.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[CmdletBinding()]
param (
[parameter(Mandatory = $true)]
[string]$EmitterPackageJsonPath,

[parameter(Mandatory = $true)]
[string]$OutputDirectory,

[parameter(Mandatory = $false)]
[string]$NpmrcPath,

[parameter(Mandatory = $false)]
[string]$LockFileName = "emitter-package-lock.json"
)

New-Item $OutputDirectory -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
$OutputDirectory = Resolve-Path $OutputDirectory

$tempFile = New-TemporaryFile
Remove-Item $tempFile

# use a consistent folder name to avoid random package name in package-lock.json
Write-Host "Creating temporary folder $tempFile/emitter-consumer"
$tempFolder = New-Item "$tempFile/emitter-consumer" -ItemType Directory

if ($NpmrcPath) {
Write-Host "Copy npmrc from $NpmrcPath to $tempFolder/.npmrc"
Copy-Item $NpmrcPath "$tempFolder/.npmrc"
}

Push-Location $tempFolder

try {
Write-Host "Copy $EmitterPackageJsonPath to $tempFolder/package.json"
Copy-Item $EmitterPackageJsonPath "$tempFolder/package.json"

Write-Host 'npm install --legacy-peer-deps'
npm install --legacy-peer-deps

if ($LASTEXITCODE) {
Write-Error "npm install failed with exit code $LASTEXITCODE"
exit $LASTEXITCODE
}

Write-Host '##[group]npm list --all'
npm list --all
Write-Host '##[endgroup]'

$dest = Join-Path $OutputDirectory $LockFileName
Write-Host "Copy package-lock.json to $dest"
Copy-Item 'package-lock.json' $dest
}
finally {
Pop-Location
}

Remove-Item $tempFolder -Recurse -Force
2 changes: 1 addition & 1 deletion eng/common/spelling/Invoke-Cspell.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function Test-VersionReportMatches() {
$expectedPackageVersion = '6.12.0'

# Act
$actual = &"$PSSCriptRoot/Invoke-Cspell.ps1" `
$actual = &"$PSScriptRoot/Invoke-Cspell.ps1" `
-JobType '--version'

# Assert
Expand Down
32 changes: 16 additions & 16 deletions eng/pipelines/templates/stages/archetype-net-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
DevOpsFeedId: '29ec6040-b234-4e31-b139-33dc4287b756/fa8c16a3-dbe0-4de2-a297-03065ec1ba3f'
TargetDocRepoOwner: 'not-specified'
TargetDocRepoName: 'not-specified'
Environment: nuget
stages:
- stage: Signing
dependsOn: ${{parameters.DependsOn}}
Expand All @@ -21,18 +20,17 @@ stages:
runOnce:
deploy:
steps:
- checkout: none
- checkout: azure-sdk-build-tools
path: azure-sdk-build-tools

- download: current
artifact: ${{parameters.ArtifactName}}
timeoutInMinutes: 5

- template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools

- template: pipelines/steps/net-signing.yml@azure-sdk-build-tools
parameters:
PackagesPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}
BuildToolsPath: $(AzureSDKBuildToolsPath)
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools

- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}
artifact: ${{parameters.ArtifactName}}-signed
Expand All @@ -50,7 +48,7 @@ stages:
- deployment: TagRepository
displayName: "Create release tag"
condition: ne(variables['Skip.TagRepository'], 'true')
environment: ${{parameters.Environment}}
environment: package-publish

pool:
name: azsdk-pool-mms-win-2022-general
Expand Down Expand Up @@ -102,7 +100,7 @@ stages:
- deployment: PublishPackage
displayName: Publish package to Nuget.org and DevOps Feed
condition: and(succeeded(), ne(variables['Skip.PublishPackage'], 'true'))
environment: ${{parameters.Environment}}
environment: package-publish
dependsOn: TagRepository

pool:
Expand Down Expand Up @@ -132,7 +130,7 @@ stages:
- deployment: UploadSymbols
displayName: Upload Symbols to Symbols Server
condition: and(succeeded(), ne(variables['Skip.SymbolsUpload'], 'true'))
environment: ${{parameters.Environment}}
environment: package-publish
dependsOn: PublishPackage

pool:
Expand All @@ -143,12 +141,13 @@ stages:
runOnce:
deploy:
steps:
- checkout: none
- template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools
- checkout: azure-sdk-build-tools
path: azure-sdk-build-tools

- task: MSBuild@1
displayName: 'Upload Symbols for ${{artifact.name}}'
inputs:
solution: '$(AzureSDKBuildToolsPath)/tools/symboltool/SymbolUploader.proj'
solution: '$(Pipeline.Workspace)/azure-sdk-build-tools/tools/symboltool/SymbolUploader.proj'
msbuildArguments: >-
/p:PackagesPath=$(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.name}}
/p:MSPublicSymbolsPAT=$(azuresdk-microsoftpublicsymbols-devops-pat)
Expand All @@ -159,7 +158,7 @@ stages:
- deployment: PublicDocsMS
displayName: Publish to Docs.MS
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
environment: ${{parameters.Environment}}
environment: package-publish
dependsOn: PublishPackage

pool:
Expand Down Expand Up @@ -192,7 +191,7 @@ stages:
- deployment: PublishDocs
displayName: Publish Docs to GitHub pages
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
environment: ${{parameters.Environment}}
environment: package-publish
dependsOn: PublishPackage

pool:
Expand All @@ -218,7 +217,7 @@ stages:
- deployment: UpdatePackageVersion
displayName: "Update Package Version"
condition: and(succeeded(), ne(variables['Skip.UpdatePackageVersion'], 'true'))
environment: ${{parameters.Environment}}
environment: package-publish
dependsOn: PublishPackage

pool:
Expand Down Expand Up @@ -262,8 +261,9 @@ stages:
name: azsdk-pool-mms-win-2022-general
vmImage: windows-2022
steps:
- checkout: none
- template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools
- checkout: azure-sdk-build-tools
path: azure-sdk-build-tools

- download: current
artifact: ${{parameters.ArtifactName}}-signed
- pwsh: |
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,3 @@ stages:
ArtifactName: packages
TargetDocRepoOwner: ${{ parameters.TargetDocRepoOwner }}
TargetDocRepoName: ${{ parameters.TargetDocRepoName }}
${{ if eq(parameters.ReleaseDependsOnLiveTests, 'false') }}:
Environment: 'nuget-break-glass-approvers'
Loading

0 comments on commit 86f7702

Please sign in to comment.