Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.7.26355.102">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.7.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.7.26355.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.7.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26355.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -36,17 +36,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26355.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26355.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.7.26355.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.7.26360.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b4b350a66ea5dcf13420747036d8b263cdf6cbef</Sha>
<Sha>50dbab4de210e882172b07934e9666313b7065f1</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.4.0-preview.26360.5">
<Uri>https://github.com/microsoft/testfx</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.7.26355.102</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.7.26355.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.7.26355.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.7.26360.111</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.7.26360.111</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26355.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26360.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.7.26355.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26355.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.7.26360.111</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26360.111</MicrosoftDotNetCecilPackageVersion>
<MSTestPackageVersion>4.4.0-preview.26360.5</MSTestPackageVersion>
<SystemIOHashingPackageVersion>10.0.9</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26355.102"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26360.111"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ public void FullPrefixRaisesError(string prefix)
},
};
var app = new XamarinAndroidApplicationProject {
References = {
new BuildItem ("ProjectReference", "..\\Library1\\Library1.csproj"),
},
OtherBuildItems = {
new AndroidItem.AndroidAsset ("Assets\\asset2.txt") {
TextContent = () => "foo",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enable
IsRelease = isRelease,
AotAssemblies = aotAssemblies,
LinkTool = linkTool,
References = { new BuildItem ("ProjectReference", $"..\\{folderName}Library1\\Library1.csproj") },
References = { new BuildItem ("ProjectReference", $"..\\{TestName}Library1\\Library1.csproj") },
};
proj.SetRuntime (runtime);
proj.OtherBuildItems.Add (new BuildItem ("AndroidJavaLibrary", "Hello (World).jar") { BinaryContent = () => Convert.FromBase64String (@"
Expand Down
Loading