Skip to content

Commit

Permalink
Merge pull request #239 from microsoft/staging
Browse files Browse the repository at this point in the history
Release - 7/16/24
  • Loading branch information
EricJohnson327 authored Jul 15, 2024
2 parents 1945fcb + a85b55d commit 1636418
Show file tree
Hide file tree
Showing 163 changed files with 5,153 additions and 3,332 deletions.
33 changes: 27 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,13 @@ csharp_style_var_elsewhere = true:suggestion
csharp_style_var_for_built_in_types = true:suggestion
#prefer var when the type is already mentioned on the right-hand side of a declaration expression
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning

#Style - language keyword and framework type options

#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

#Style - Language rules
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
csharp_style_var_for_built_in_types = true:warning

#Style - modifier options

#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
Expand Down Expand Up @@ -132,6 +129,9 @@ csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent

# IDE0290: Use primary constructor
dotnet_diagnostic.IDE0290.severity = silent

[*.{cs,vb}]
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
Expand All @@ -146,7 +146,6 @@ dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
[*.{cs,vb}]

#Style - Unnecessary code rules
csharp_style_unused_value_assignment_preference = discard_variable:warning
Expand Down Expand Up @@ -203,10 +202,32 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:warning
dotnet_style_prefer_simplified_interpolation = true:suggestion

# Define what we will treat as private fields.
dotnet_naming_symbols.private_fields.applicable_kinds = field
dotnet_naming_symbols.private_fields.applicable_accessibilities = private

dotnet_naming_symbols.const_private_fields.applicable_kinds = field
dotnet_naming_symbols.const_private_fields.applicable_accessibilities = private
dotnet_naming_symbols.const_private_fields.required_modifiers = const

# Define rule that something must begin with an underscore and be in camel case.
dotnet_naming_style.require_underscore_prefix_and_camel_case.required_prefix = _
dotnet_naming_style.require_underscore_prefix_and_camel_case.capitalization = camel_case

dotnet_naming_style.requre_no_prefix_and_pascal_case.required_prefix =
dotnet_naming_style.requre_no_prefix_and_pascal_case.capitalization = pascal_case

# Appy our rule to private fields.
dotnet_naming_rule.private_fields_must_begin_with_underscore_and_be_in_camel_case.symbols = private_fields
dotnet_naming_rule.private_fields_must_begin_with_underscore_and_be_in_camel_case.style = require_underscore_prefix_and_camel_case
dotnet_naming_rule.private_fields_must_begin_with_underscore_and_be_in_camel_case.severity = warning

dotnet_naming_rule.const_fields_must_begin_with_no_prefix_and_be_in_pascal_case.symbols = const_private_fields
dotnet_naming_rule.const_fields_must_begin_with_no_prefix_and_be_in_pascal_case.style = requre_no_prefix_and_pascal_case
dotnet_naming_rule.const_fields_must_begin_with_no_prefix_and_be_in_pascal_case.severity = warning
# Spelling

spelling_exclusion_path = .\exclusion.dic
spelling_error_severity = warning

# Diagnostic configuration

Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:
- release

variables:
MSIXVersion: '0.1000'
MSIXVersion: '0.1100'
solution: '**/DevHomeAzureExtension.sln'
appxPackageDir: 'AppxPackages'
testOutputArtifactDir: 'TestResults'
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/CreateBuildInfo.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Param(
)

$Major = "0"
$Minor = "10"
$Minor = "11"
$Patch = "99" # default to 99 for local builds

$versionSplit = $Version.Split(".");
Expand Down
17 changes: 12 additions & 5 deletions exclusion.dic
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ brokerplugin
Entra
riid
enums
enums
Stdout
visualstudio
vssps
Entra
riid
foobar
msix
yaml
Quickstart
Tensorflow
vscode
codespace
codespaces
dhlog
appsettings
deserializer
winget
csharp
Binary file modified src/AzureExtension/Assets/DevBoxProvider.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \
apt-get install -y git
RUN apt-get update && apt-get upgrade -y
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu
ENV DEBIAN_FRONTEND noninteractive

RUN apt update && \
apt install -y curl && build-essentials \
apt install -y curl && build-essential \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
Loading

0 comments on commit 1636418

Please sign in to comment.