Skip to content
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.

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

Merge main to dev17.0 #913

Open
wants to merge 10 commits into
base: dev17.0
Choose a base branch
from
12 changes: 7 additions & 5 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ stages:
displayName: Build and Test

jobs:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYNSDK'
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
CreatePr: true
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYNSDK'

- job: OfficialBuild
displayName: Official Build
pool:
name: VSEngSS-MicroBuild2019
name: VSEngSS-MicroBuild2019-1ES
demands:
- cmd

Expand Down
4 changes: 2 additions & 2 deletions .vsts-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ variables:
jobs:
- job: Windows
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.Open
strategy:
maxParallel: 6
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net45
Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net451
Expand Down Expand Up @@ -253,6 +254,12 @@ static Microsoft.CodeAnalysis.Testing.IVerifierExtensions.EqualOrDiff(this Micro
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net50.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60Android.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60MacCatalyst.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60MacOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60TvOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60Windows.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60iOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp10.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp11.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp20.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
Expand All @@ -261,6 +268,9 @@ static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp30.g
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp31.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.Wpf.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.Wpf.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Testing
{
public sealed partial class ReferenceAssemblies
{
private const string ReferenceAssembliesPackageVersion = "1.0.0";
private const string ReferenceAssembliesPackageVersion = "1.0.2";

private static readonly FileSystemSemaphore Semaphore = new FileSystemSemaphore(Path.Combine(Path.GetTempPath(), "test-packages", ".lock"));

Expand Down Expand Up @@ -579,6 +579,26 @@ public static class Net20
= Default.AddAssemblies(ImmutableArray.Create("System.Drawing", "System.Windows.Forms"));
}

public static class Net35
{
public static ReferenceAssemblies Default { get; }
= new ReferenceAssemblies(
"net35",
new PackageIdentity(
"Microsoft.NETFramework.ReferenceAssemblies.net35",
ReferenceAssembliesPackageVersion),
Path.Combine("build", ".NETFramework", "v3.5"))
.WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
.AddAssemblies(ImmutableArray.Create("mscorlib", "System", "System.Core", "System.Data", "System.Data.DataSetExtensions", "System.Xml", "System.Xml.Linq"))
.AddLanguageSpecificAssemblies(LanguageNames.VisualBasic, ImmutableArray.Create("Microsoft.VisualBasic"));

public static ReferenceAssemblies WindowsForms { get; }
= Default.AddAssemblies(ImmutableArray.Create("System.Deployment", "System.Drawing", "System.Windows.Forms"));

public static ReferenceAssemblies Wpf { get; }
= Default.AddAssemblies(ImmutableArray.Create("PresentationCore", "PresentationFramework", "WindowsBase"));
}

public static class Net40
{
public static ReferenceAssemblies Default { get; }
Expand Down Expand Up @@ -878,13 +898,61 @@ public static class Net
"net6.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"6.0.0-preview.6.21352.12"),
"6.0.0-rc.1.21451.13"),
Path.Combine("ref", "net6.0"));
});

private static readonly Lazy<ReferenceAssemblies> _lazyNet60Windows =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.WindowsDesktop.App.Ref", "6.0.0-rc.1.21451.3"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet60Android =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.Android.Ref", "31.0.100-rc.1.12"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet60iOS =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.iOS.Ref", "15.0.100-rc.1.1534"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet60MacOS =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.macOS.Ref", "12.0.100-rc.1.1534"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet60MacCatalyst =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.MacCatalyst.Ref", "15.0.100-rc.1.1534"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet60TvOS =
new Lazy<ReferenceAssemblies>(() =>
Net60.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.tvOS.Ref", "15.0.100-rc.1.1534"))));

public static ReferenceAssemblies Net50 => _lazyNet50.Value;

public static ReferenceAssemblies Net60 => _lazyNet60.Value;

public static ReferenceAssemblies Net60Windows => _lazyNet60Windows.Value;

public static ReferenceAssemblies Net60Android => _lazyNet60Android.Value;

public static ReferenceAssemblies Net60iOS => _lazyNet60iOS.Value;

public static ReferenceAssemblies Net60MacOS => _lazyNet60MacOS.Value;

public static ReferenceAssemblies Net60MacCatalyst => _lazyNet60MacCatalyst.Value;

public static ReferenceAssemblies Net60TvOS => _lazyNet60TvOS.Value;
}

public static class NetStandard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<body>
<trans-unit id="DynamicEnumProperty|targetProject|Description">
<source>A project that uses this component, whose compilation will be debugged.</source>
<target state="new">A project that uses this component, whose compilation will be debugged.</target>
<target state="translated">Projekt, který používá tuto komponentu, jejíž kompilace se bude ladit.</target>
<note />
</trans-unit>
<trans-unit id="DynamicEnumProperty|targetProject|DisplayName">
<source>Target Project</source>
<target state="new">Target Project</target>
<target state="translated">Cílový projekt</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|Description">
<source>Allows a user to debug a Roslyn Component by running it in the context of another projects build.</source>
<target state="new">Allows a user to debug a Roslyn Component by running it in the context of another projects build.</target>
<target state="translated">Umožňuje uživateli ladit komponentu Roslyn spuštěním v kontextu sestavení jiného projektu.</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|DisplayName">
<source>Roslyn Component</source>
<target state="new">Roslyn Component</target>
<target state="translated">Komponenta Roslyn</target>
<note />
</trans-unit>
<trans-unit id="StringProperty|Description|Description">
<source>A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</source>
<target state="new">A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</target>
<target state="translated">Komponentu Roslyn je možné ladit v kontextu kompilace druhého projektu, který ji používá. Ujistěte se, že cílový projekt odkazuje na tuto komponentu, aby se zobrazila v seznamu.</target>
<note />
</trans-unit>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<body>
<trans-unit id="DynamicEnumProperty|targetProject|Description">
<source>A project that uses this component, whose compilation will be debugged.</source>
<target state="new">A project that uses this component, whose compilation will be debugged.</target>
<target state="translated">Ein Projekt, das diese Komponente verwendet, deren Kompilierung debuggt wird.</target>
<note />
</trans-unit>
<trans-unit id="DynamicEnumProperty|targetProject|DisplayName">
<source>Target Project</source>
<target state="new">Target Project</target>
<target state="translated">Zielprojekt</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|Description">
<source>Allows a user to debug a Roslyn Component by running it in the context of another projects build.</source>
<target state="new">Allows a user to debug a Roslyn Component by running it in the context of another projects build.</target>
<target state="translated">Ermöglicht einem Benutzer das Debuggen einer Roslyn-Komponente, indem er sie im Kontext eines anderen Projektbuilds ausführt.</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|DisplayName">
<source>Roslyn Component</source>
<target state="new">Roslyn Component</target>
<target state="translated">Roslyn-Komponente</target>
<note />
</trans-unit>
<trans-unit id="StringProperty|Description|Description">
<source>A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</source>
<target state="new">A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</target>
<target state="translated">Eine Roslyn-Komponente kann im Kontext der Kompilierung eines zweiten Projekts, das sie verwendet, debuggt werden. Stellen Sie sicher, dass Ihr Zielprojekt auf diese Komponente verweist, damit sie in der Liste angezeigt wird.</target>
<note />
</trans-unit>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<body>
<trans-unit id="DynamicEnumProperty|targetProject|Description">
<source>A project that uses this component, whose compilation will be debugged.</source>
<target state="new">A project that uses this component, whose compilation will be debugged.</target>
<target state="translated">Proyecto que usa este componente, cuya compilación se depurará.</target>
<note />
</trans-unit>
<trans-unit id="DynamicEnumProperty|targetProject|DisplayName">
<source>Target Project</source>
<target state="new">Target Project</target>
<target state="translated">Proyecto de destino</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|Description">
<source>Allows a user to debug a Roslyn Component by running it in the context of another projects build.</source>
<target state="new">Allows a user to debug a Roslyn Component by running it in the context of another projects build.</target>
<target state="translated">Permite a un usuario depurar un componente de Roslyn ejecutándolo en el contexto de otra compilación de proyectos.</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|DisplayName">
<source>Roslyn Component</source>
<target state="new">Roslyn Component</target>
<target state="translated">Componente Roslyn</target>
<note />
</trans-unit>
<trans-unit id="StringProperty|Description|Description">
<source>A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</source>
<target state="new">A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</target>
<target state="translated">Un componente Roslyn se puede depurar en el contexto de compilar un segundo proyecto que lo use. Asegúrese de que el proyecto de destino hace referencia a este componente para que aparezca en la lista.</target>
<note />
</trans-unit>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<body>
<trans-unit id="DynamicEnumProperty|targetProject|Description">
<source>A project that uses this component, whose compilation will be debugged.</source>
<target state="new">A project that uses this component, whose compilation will be debugged.</target>
<target state="translated">Projet qui utilise ce composant, dont la compilation sera déboguée.</target>
<note />
</trans-unit>
<trans-unit id="DynamicEnumProperty|targetProject|DisplayName">
<source>Target Project</source>
<target state="new">Target Project</target>
<target state="translated">Projet cible</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|Description">
<source>Allows a user to debug a Roslyn Component by running it in the context of another projects build.</source>
<target state="new">Allows a user to debug a Roslyn Component by running it in the context of another projects build.</target>
<target state="translated">Permet à un utilisateur de déboguer un composant Roslyn en l’exécutant dans le contexte d’un autre Build de projets.</target>
<note />
</trans-unit>
<trans-unit id="Rule|ComponentDebuggerLaunchProfile|DisplayName">
<source>Roslyn Component</source>
<target state="new">Roslyn Component</target>
<target state="translated">Composant Roslyn</target>
<note />
</trans-unit>
<trans-unit id="StringProperty|Description|Description">
<source>A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</source>
<target state="new">A Roslyn Component can be debugged in the context of compiling a second project that uses it. Ensure your target project is referencing this component for it to appear in the list.</target>
<target state="translated">Un composant Roslyn peut être débogué dans le contexte de la compilation d'un second projet qui l'utilise. Assurez-vous que votre projet cible fait référence à ce composant pour qu'il apparaisse dans la liste.</target>
<note />
</trans-unit>
</body>
Expand Down
Loading