Skip to content

Commit e9ee3d4

Browse files
Fix places still pointing to xamarin/xamarin-android (#9050)
Fix code that would show up in user-facing places like the `Version.commit`, SourceLink, etc. Or places that make web requests using this URL. There are still many links in `.md` files or code comments, but those should redirect appropriately. Probably not a huge concern in updating those yet?
1 parent b2b0f2d commit e9ee3d4

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

build-tools/create-packs/License.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Authors>Microsoft</Authors>
55
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
6-
<PackageProjectUrl>https://github.com/xamarin/xamarin-android</PackageProjectUrl>
6+
<PackageProjectUrl>https://github.com/dotnet/android</PackageProjectUrl>
77
<NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
88
<NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
99
<PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>

build-tools/debian-metadata/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Maintainer: Xamarin <[email protected]>
55
Build-Depends: debhelper (>=9), cli-common-dev (>= 0.9~)
66
Standards-Version: 3.9.6
77
Homepage: https://www.xamarin.com/platform
8-
Vcs-Git: https://github.com/xamarin/xamarin-android.git
9-
Vcs-Browser: https://github.com/xamarin/xamarin-android
8+
Vcs-Git: https://github.com/dotnet/android.git
9+
Vcs-Browser: https://github.com/dotnet/android
1010

1111
Package: xamarin.android-oss
1212
Architecture: amd64

build-tools/scripts/XAVersionInfo.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Output TaskParameter="Branch" PropertyName="XAVersionBranch" Condition=" '$(XAVersionBranch)' == '' " />
7676
</GitBranch>
7777
<PropertyGroup>
78-
<XARepositoryName Condition=" '$(XARepositoryName)' == '' ">xamarin-android</XARepositoryName>
78+
<XARepositoryName Condition=" '$(XARepositoryName)' == '' ">dotnet/android</XARepositoryName>
7979
<!-- See Azure Pipelines predefined variables. -->
8080
<_AndroidPackLabel Condition=" '$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)' != '' ">ci.pr.gh$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER).$(PackVersionCommitCount)</_AndroidPackLabel>
8181
<_AndroidPackBranch>$([System.Text.RegularExpressions.Regex]::Replace('$(XAVersionBranch)', '[^a-zA-Z0-9-]', '-'))</_AndroidPackBranch>

build-tools/xaprepare/xaprepare/Application/GeneratedSourceLinkJsonFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public override void Generate (Context context)
3333

3434
json.AppendLine ($" \"{localPath}/*\": \"{contentUri.Uri}/*\",");
3535
}
36-
json.AppendLine ($" \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/xamarin/xamarin-android/{xaCommit}/*\"");
36+
json.AppendLine ($" \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/dotnet/android/{xaCommit}/*\"");
3737
json.AppendLine (" }");
3838
json.AppendLine ("}");
3939

tools/relnote-gen/App.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ enum State {
1515

1616
static class App {
1717

18-
const string XamarinAndroidCommitBase = "http://github.com/xamarin/xamarin-android/commit/";
19-
const string XamarinAndroidPullBase = "http://github.com/xamarin/xamarin-android/pull/";
20-
const string XamarinAndroidIssuesBase = "http://github.com/xamarin/xamarin-android/issues/";
18+
const string XamarinAndroidCommitBase = "https://github.com/dotnet/android/commit/";
19+
const string XamarinAndroidPullBase = "https://github.com/dotnet/android/pull/";
20+
const string XamarinAndroidIssuesBase = "https://github.com/dotnet/android/issues/";
2121

2222
static readonly Regex SummaryParser = new Regex (
2323
@"^\s*(\[(?<component>[^]]+)\]\s+)?" +

tools/relnote-gen/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Then the output of `renote-gen` will be:
3434

3535
- Summary
3636
([#NUMBER](URL/NUMBER),
37-
[PR #PR](http://github.com/xamarin/xamarin-android/pull/PR),
38-
[Commit COMMIT](http://github.com/xamarin/xamarin-android/commit/COMMIT))
37+
[PR #PR](https://github.com/dotnet/android/pull/PR),
38+
[Commit COMMIT](https://github.com/dotnet/android/commit/COMMIT))
3939
```
4040

4141
# API Diffs?

0 commit comments

Comments
 (0)