Skip to content

Commit

Permalink
Update master to main (#22177)
Browse files Browse the repository at this point in the history
  • Loading branch information
weshaggard authored Jun 24, 2021
1 parent 7378293 commit 584f576
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions eng/scripts/Language-Settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $LanguageShort = "net"
$LanguageDisplayName = ".NET"
$PackageRepository = "Nuget"
$packagePattern = "*.nupkg"
$MetadataUri = "https://raw.githubusercontent.com/Azure/azure-sdk/master/_data/releases/latest/dotnet-packages.csv"
$MetadataUri = "https://raw.githubusercontent.com/Azure/azure-sdk/main/_data/releases/latest/dotnet-packages.csv"
$BlobStorageUrl = "https://azuresdkdocs.blob.core.windows.net/%24web?restype=container&comp=list&prefix=dotnet%2F&delimiter=%2F"

function Get-dotnet-PackageInfoFromRepo ($pkgPath, $serviceDirectory)
Expand All @@ -16,7 +16,7 @@ function Get-dotnet-PackageInfoFromRepo ($pkgPath, $serviceDirectory)
}

$projectPaths = @(Resolve-Path (Join-Path $projDirPath "*.csproj"))

if ($projectpaths.Count -ge 1) {
$projectPath = $projectPaths[0].path
if ($projectPaths.Count -gt 1) {
Expand All @@ -29,7 +29,7 @@ function Get-dotnet-PackageInfoFromRepo ($pkgPath, $serviceDirectory)

if ($projectPath -and (Test-Path $projectPath))
{
$pkgName = Split-Path -Path $projectPath -LeafBase
$pkgName = Split-Path -Path $projectPath -LeafBase
$projectData = New-Object -TypeName XML
$projectData.load($projectPath)
$pkgVersion = Select-XML -Xml $projectData -XPath '/Project/PropertyGroup/Version'
Expand All @@ -49,7 +49,7 @@ function Get-dotnet-PackageInfoFromRepo ($pkgPath, $serviceDirectory)
}

# Returns the nuget publish status of a package id and version.
function IsNugetPackageVersionPublished ($pkgId, $pkgVersion)
function IsNugetPackageVersionPublished ($pkgId, $pkgVersion)
{
$nugetUri = "https://api.nuget.org/v3-flatcontainer/$($pkgId.ToLowerInvariant())/index.json"

Expand All @@ -76,7 +76,7 @@ function IsNugetPackageVersionPublished ($pkgId, $pkgVersion)
}

# Parse out package publishing information given a nupkg ZIP format.
function Get-dotnet-PackageInfoFromPackageFile ($pkg, $workingDirectory)
function Get-dotnet-PackageInfoFromPackageFile ($pkg, $workingDirectory)
{
$workFolder = "$workingDirectory$($pkg.Basename)"
$origFolder = Get-Location
Expand All @@ -94,13 +94,13 @@ function Get-dotnet-PackageInfoFromPackageFile ($pkg, $workingDirectory)
$pkgVersion = $packageXML.package.metadata.version

$changeLogLoc = @(Get-ChildItem -Path $workFolder -Recurse -Include "CHANGELOG.md")[0]
if ($changeLogLoc)
if ($changeLogLoc)
{
$releaseNotes = Get-ChangeLogEntryAsString -ChangeLogLocation $changeLogLoc -VersionString $pkgVersion
}

$readmeContentLoc = @(Get-ChildItem -Path $workFolder -Recurse -Include "README.md")[0]
if ($readmeContentLoc)
if ($readmeContentLoc)
{
$readmeContent = Get-Content -Raw $readmeContentLoc
}
Expand Down Expand Up @@ -190,7 +190,7 @@ function Get-dotnet-GithubIoDocIndex()
function Update-dotnet-CIConfig($pkgs, $ciRepo, $locationInDocRepo, $monikerId=$null)
{
$csvLoc = (Join-Path -Path $ciRepo -ChildPath $locationInDocRepo)

if (-not (Test-Path $csvLoc)) {
Write-Error "Unable to locate package csv at location $csvLoc, exiting."
exit(1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public abstract class BaseTests
}
}

return $"https://raw.githubusercontent.com/{user}/azure-sdk-for-net/master/sdk/cognitiveservices/Vision.ComputerVision/tests/TestImages/";
return $"https://raw.githubusercontent.com/{user}/azure-sdk-for-net/main/sdk/cognitiveservices/Vision.ComputerVision/tests/TestImages/";
});

static BaseTests()
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract class FormRecognizerTest<TOptions> : PerfTest<TOptions> where TO
private const string AssetsFolderName = "Assets";

/// <summary>The format to generate the GitHub URIs of the files to be used for tests.</summary>
private const string FileUriFormat = "https://raw.githubusercontent.com/Azure/azure-sdk-for-net/master/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/{0}/{1}";
private const string FileUriFormat = "https://raw.githubusercontent.com/Azure/azure-sdk-for-net/main/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/{0}/{1}";

public FormRecognizerTest(TOptions options) : base(options)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public FormRecognizerTestEnvironment()
private const string AssetsFolderName = "Assets";

/// <summary>The format to generate the GitHub URIs of the files to be used for tests.</summary>
private const string FileUriFormat = "https://raw.githubusercontent.com/Azure/azure-sdk-for-net/master/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/{0}/{1}";
private const string FileUriFormat = "https://raw.githubusercontent.com/Azure/azure-sdk-for-net/main/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/{0}/{1}";

public string ApiKey => GetRecordedVariable(ApiKeyEnvironmentVariableName, options => options.IsSecret());
public string Endpoint => GetRecordedVariable(EndpointEnvironmentVariableName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Description>
This client library enables working with the Microsoft Azure Storage Change Feed feature to review and monitor changes to an Azure Storage account.
For this release see notes - https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/storage/Azure.Storage.Blobs.ChangeFeed/README.md and https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/storage/Azure.Storage.Blobs.ChangeFeed/CHANGELOG.md
in addition to the breaking changes https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/storage/Azure.Storage.Blobs.ChangeFeed/BreakingChanges.txt
in addition to the breaking changes https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/storage/Azure.Storage.Blobs.ChangeFeed/BreakingChanges.txt
</Description>
<GenerateAPIListing>true</GenerateAPIListing>
</PropertyGroup>
Expand Down

0 comments on commit 584f576

Please sign in to comment.