Skip to content

Commit fabe67a

Browse files
committed
Fix casing and '\' on Linux.
1 parent e32f3c5 commit fabe67a

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

src/Authentication/Authentication/Microsoft.Graph.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Repo.props" />
2020
<ItemGroup>
21-
<PreLoadAssemblies Include="$(RepoTools)lib\System.Security.Cryptography.ProtectedData.dll" />
21+
<PreLoadAssemblies Include="$(RepoTools)Lib\System.Security.Cryptography.ProtectedData.dll" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />

tools/GenerateModules.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Install-Module powershell-yaml -Force
2929

3030
$GraphVersion = "v1.0"
3131
if ($BetaGraphVersion) {
32-
$GraphVersion = "beta"
32+
$GraphVersion = "Beta"
3333
}
3434
$ModulePrefix = "Microsoft.Graph"
3535
$ModulesOutputDir = Join-Path $PSScriptRoot "..\src\$GraphVersion\"
@@ -59,7 +59,7 @@ Install-Module $ExistingAuthModule.Name -Repository $RepositoryName -AllowPrerel
5959
$RequiredGraphModules += @{ ModuleName = $ExistingAuthModule.Name ; RequiredVersion = $ExistingAuthModule.Version }
6060
if ($UpdateAutoRest) {
6161
# Update AutoRest.
62-
& AutoRest-beta --reset
62+
& autorest --reset
6363
}
6464

6565
[HashTable] $ModuleMapping = Get-Content $ModuleMappingConfigPath | ConvertFrom-Json -AsHashTable
@@ -109,7 +109,7 @@ $ModuleMapping.Keys | ForEach-Object {
109109
Write-Host -ForegroundColor Green "Generating '$ModulePrefix.$ModuleName' module..."
110110
$OpenApiDocPath = Join-Path $OpenApiDocOutput "" -Resolve
111111

112-
& AutoRest --module-version:$ModuleVersion --service-name:$ModuleName --spec-doc-repo:$OpenApiDocPath $ModuleLevelReadMePath --verbose
112+
& autorest --module-version:$ModuleVersion --service-name:$ModuleName --spec-doc-repo:$OpenApiDocPath $ModuleLevelReadMePath --verbose
113113
if ($LASTEXITCODE) {
114114
Write-Error "Failed to generate '$ModuleName' module."
115115
}

tools/ManageGeneratedModule.ps1

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $LASTEXITCODE = $null
1616
$NugetPackagesToRemove = "Microsoft.CSharp"
1717
$AuthenticationProj = Join-Path $PSScriptRoot "..\src\Authentication\Authentication\Microsoft.Graph.Authentication.csproj"
1818
$GeneratedModuleSlnDir = Join-Path $PSScriptRoot "..\src\$GraphVersion\$Module"
19-
$GeneratedModuleProj = Join-Path $GeneratedModuleSlnDir "$Module\$ModulePrefix.$Module.csproj"
19+
$GeneratedModuleProj = Join-Path $GeneratedModuleSlnDir "$Module\$ModulePrefix.$Module.csproj"
2020
$CustomCodeDir = Join-Path $PSScriptRoot "\Custom\"
2121

2222
if(-not (Test-Path "$GeneratedModuleSlnDir\$Module.sln")) {
@@ -28,12 +28,13 @@ if(-not (Test-Path "$GeneratedModuleSlnDir\$Module.sln")) {
2828
return
2929
}
3030
}
31+
$GeneratedModuleSln = Join-Path $GeneratedModuleSlnDir "$Module.sln"
3132

3233
# Add generated module project to solution.
33-
Write-Host -ForegroundColor Green "Executing: dotnet sln $GeneratedModuleSlnDir\$Module.sln add $GeneratedModuleProj"
34-
dotnet sln "$GeneratedModuleSlnDir\$Module.sln" add $GeneratedModuleProj
34+
Write-Host -ForegroundColor Green "Executing: dotnet sln $GeneratedModuleSln add $GeneratedModuleProj"
35+
dotnet sln $GeneratedModuleSln add $GeneratedModuleProj
3536
if($LASTEXITCODE){
36-
Write-Error "Failed to execute: dotnet sln $GeneratedModuleSlnDir\$Module.sln add $GeneratedModuleProj"
37+
Write-Error "Failed to execute: dotnet sln $GeneratedModuleSln add $GeneratedModuleProj"
3738
return
3839
}
3940

@@ -63,10 +64,10 @@ foreach($Package in $NugetPackagesToRemove)
6364
}
6465

6566
# Restore packages.
66-
Write-Host -ForegroundColor Green "Executing: dotnet restore $GeneratedModuleSlnDir\$Module.sln"
67-
dotnet restore "$GeneratedModuleSlnDir\$Module.sln"
67+
Write-Host -ForegroundColor Green "Executing: dotnet restore $GeneratedModuleSln"
68+
dotnet restore $GeneratedModuleSln
6869
if($LASTEXITCODE){
69-
Write-Error "Failed to execute: dotnet restore $GeneratedModuleSlnDir\$Module.sln"
70+
Write-Error "Failed to execute: dotnet restore $GeneratedModuleSln"
7071
return
7172
}
7273
Write-Host -ForegroundColor Green "-------------Done-------------"

0 commit comments

Comments
 (0)