Skip to content

Update property names to avoid conflicts #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyGerlicher merged 3 commits into from
Jul 30, 2025
Merged

Update property names to avoid conflicts #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b45961
set azureauth version env var
novacole Jul 28, 2025
9d55ef6
update commandarg environment variable names, to avoid conflict
novacole Jul 30, 2025
f23d442
Merge branch 'main' of https://github.com/novacole/MSBuildSdks into d…
novacole Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Cargo/sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,15 @@
<!-- Rust specific props -->
<PropertyGroup>
<AuthMode Condition="'$(AuthMode)' == ''">false</AuthMode>
<BuildCommandArgs Condition="'$(BuildCommandArgs)' == ''"></BuildCommandArgs>
<TestCommandArgs Condition="'$(TestCommandArgs)' == ''"></TestCommandArgs>
<CleanCommandArgs Condition="'$(CleanCommandArgs)' == ''"></CleanCommandArgs>
<CargoBuildCommandArgs Condition="'$(CargoBuildCommandArgs)' == ''"></CargoBuildCommandArgs>
<CargoTestCommandArgs Condition="'$(CargoTestCommandArgs)' == ''"></CargoTestCommandArgs>
<CargoCleanCommandArgs Condition="'$(CargoCleanCommandArgs)' == ''"></CargoCleanCommandArgs>
<ClearCargoCacheCommandArgs Condition="'$(ClearCargoCacheCommandArgs)' == ''"></ClearCargoCacheCommandArgs>
<CargoCommandArgs Condition="'$(CargoCommandArgs)' == ''"></CargoCommandArgs>
<RunCommandArgs Condition="'$(RunCommandArgs)' == ''"></RunCommandArgs>
<CargoRunCommandArgs Condition="'$(CargoRunCommandArgs)' == ''"></CargoRunCommandArgs>
<CargoInstallCommandArgs Condition="'$(CargoInstallCommandArgs)' == ''"></CargoInstallCommandArgs>
<DocCommandArgs Condition="'$(DocCommandArgs)' == ''"></DocCommandArgs>
<CargoUpdateCommandArgs Condition="'$(CargoUpdateCommandArgs)' == ''"></CargoUpdateCommandArgs>
<CargoDocCommandArgs Condition="'$(CargoDocCommandArgs)' == ''"></CargoDocCommandArgs>
<StartupProj Condition="'$(StartupProj)' == ''">$(MSBuildProjectFullPath)</StartupProj>
<RepoRoot Condition="'$(RepoRoot)' == ''">$(EnlistmentRoot)</RepoRoot>
<CargoInstallationRoot Condition="'$(CargoInstallationRoot)' == ''"></CargoInstallationRoot>
Expand Down
12 changes: 6 additions & 6 deletions src/Cargo/sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,19 @@
<CargoTask EnableAuth="$(AuthMode)" StartupProj="$(StartupProj)" Command="fetch" RepoRoot="$(RepoRoot)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoBuild" AfterTargets="CoreCompile">
<CargoTask EnableAuth="$(AuthMode)" StartupProj="$(StartupProj)" Command="build" CommandArgs="$(BuildCommandArgs)" Configuration="$(Configuration)" RepoRoot="$(RepoRoot)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask EnableAuth="$(AuthMode)" StartupProj="$(StartupProj)" Command="build" CommandArgs="$(CargoBuildCommandArgs)" Configuration="$(Configuration)" RepoRoot="$(RepoRoot)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoTest" DependsOnTargets="CargoFetch">
<CargoTask StartupProj="$(StartupProj)" Command="test" CommandArgs="$(TestCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask StartupProj="$(StartupProj)" Command="test" CommandArgs="$(CargoTestCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoRun" DependsOnTargets="CargoFetch">
<CargoTask StartupProj="$(StartupProj)" Command="run" CommandArgs="$(RunCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask StartupProj="$(StartupProj)" Command="run" CommandArgs="$(CargoRunCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoDoc" DependsOnTargets="CargoFetch">
<CargoTask StartupProj="$(StartupProj)" Command="doc" CommandArgs="$(DocCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask StartupProj="$(StartupProj)" Command="doc" CommandArgs="$(CargoDocCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoUpdate" DependsOnTargets="CargoFetch">
<CargoTask StartupProj="$(StartupProj)" Command="update" CommandArgs="$(UpdateCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask StartupProj="$(StartupProj)" Command="update" CommandArgs="$(CargoUpdateCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoInstall" DependsOnTargets="CargoFetch">
<CargoTask StartupProj="$(StartupProj)" Command="install" CommandArgs="$(CargoInstallCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
Expand All @@ -140,7 +140,7 @@
<CargoTask StartupProj="$(StartupProj)" Command="$(CargoCommand)" CommandArgs="$(CargoCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="CargoClean">
<CargoTask StartupProj="$(StartupProj)" Command="clean" CommandArgs="$(CleanCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
<CargoTask StartupProj="$(StartupProj)" Command="clean" CommandArgs="$(CargoCleanCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
</Target>
<Target Name="ClearCargoCache">
<CargoTask StartupProj="$(StartupProj)" Command="clearcargocache" CommandArgs="$(ClearCargoCacheCommandArgs)" CargoInstallationRoot="$(CargoInstallationRoot)" MsRustupAuthType="$(MsRustupAuthType)" CargoOutputDir="$(CargoOutputDir)" />
Expand Down