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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

ARG DEVPROXY_VERSION=0.25.0
ARG DEVPROXY_VERSION=0.28.0
ARG USERNAME=devproxy
ENV DEVPROXY_VERSION=${DEVPROXY_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_beta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

ARG DEVPROXY_VERSION=0.25.0
ARG DEVPROXY_VERSION=0.28.0
ARG USERNAME=devproxy
ENV DEVPROXY_VERSION=${DEVPROXY_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion dev-proxy-abstractions/dev-proxy-abstractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>DevProxy.Abstractions</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>0.27.0</Version>
<Version>0.28.0</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy-plugins/Mocks/MockResponsePlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class MockResponseConfiguration
public bool BlockUnmockedRequests { get; set; } = false;

[JsonPropertyName("$schema")]
public string Schema { get; set; } = "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/mockresponseplugin.mocksfile.schema.json";
public string Schema { get; set; } = "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/mockresponseplugin.mocksfile.schema.json";
public IEnumerable<MockResponse> Mocks { get; set; } = [];
}

Expand Down
2 changes: 1 addition & 1 deletion dev-proxy-plugins/dev-proxy-plugins.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
<EnableDynamicLoading>true</EnableDynamicLoading>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<Version>0.27.0</Version>
<Version>0.28.0</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy/config/m365-mocks.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/mockresponseplugin.mocksfile.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/mockresponseplugin.mocksfile.schema.json",
"mocks": [
{
"request": {
Expand Down
18 changes: 9 additions & 9 deletions dev-proxy/config/m365.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/rc.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/rc.schema.json",
"plugins": [
{
"name": "DevToolsPlugin",
Expand Down Expand Up @@ -173,11 +173,11 @@
"https://*.sharepoint-df.*/*_vti_bin/*"
],
"mocksPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/mockresponseplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/mockresponseplugin.schema.json",
"mocksFile": "m365-mocks.json"
},
"graphRandomErrorsPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/graphrandomerrorplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/graphrandomerrorplugin.schema.json",
"allowedErrors": [
429,
500,
Expand All @@ -189,28 +189,28 @@
"rate": 50
},
"executionSummaryPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/executionsummaryplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/executionsummaryplugin.schema.json",
"groupBy": "url"
},
"graphMinimalPermissionsPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/graphminimalpermissionsplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/graphminimalpermissionsplugin.schema.json",
"type": "delegated"
},
"cachingGuidance": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/cachingguidanceplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/cachingguidanceplugin.schema.json",
"cacheThresholdSeconds": 5
},
"latencyPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/latencyplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/latencyplugin.schema.json",
"minMs": 200,
"maxMs": 10000
},
"devTools": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/devtoolsplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/devtoolsplugin.schema.json",
"preferredBrowser": "Edge"
},
"rateLimiting": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/ratelimitingplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/ratelimitingplugin.schema.json",
"costPerRequest": 2,
"rateLimit": 120,
"retryAfterSeconds": 5
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy/config/microsoft-graph-rate-limiting.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/rc.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/rc.schema.json",
"plugins": [
{
"name": "RateLimitingPlugin",
Expand Down
6 changes: 3 additions & 3 deletions dev-proxy/config/microsoft-graph.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/rc.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/rc.schema.json",
"plugins": [
{
"name": "GraphSelectGuidancePlugin",
Expand Down Expand Up @@ -67,7 +67,7 @@
"https://microsoftgraph.chinacloudapi.cn/beta/*"
],
"graphRandomErrorsPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/graphrandomerrorplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/graphrandomerrorplugin.schema.json",
"allowedErrors": [
429,
500,
Expand All @@ -79,7 +79,7 @@
"rate": 50
},
"executionSummaryPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/executionsummaryplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/executionsummaryplugin.schema.json",
"groupBy": "url"
},
"labelMode": "text",
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy/config/spo-csom-types.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/minimalcsompermissions.types.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/minimalcsompermissions.types.schema.json",
"types": {
"268004ae-ef6b-4e9b-8425-127220d84719": "Microsoft.Online.SharePoint.TenantAdministration.Tenant",
"3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a": "Microsoft.SharePoint.Client.RequestContext"
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy/dev-proxy.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Nullable>enable</Nullable>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Title>Dev Proxy</Title>
<Version>0.27.0</Version>
<Version>0.28.0</Version>
<Company>.NET Foundation</Company>
<Product>Dev Proxy</Product>
<AssemblyName>devproxy</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion dev-proxy/devproxy-errors.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/genericrandomerrorplugin.errorsfile.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/genericrandomerrorplugin.errorsfile.schema.json",
"errors": [
{
"request": {
Expand Down
4 changes: 2 additions & 2 deletions dev-proxy/devproxyrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/rc.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/rc.schema.json",
"plugins": [
{
"name": "RetryAfterPlugin",
Expand All @@ -17,7 +17,7 @@
"https://jsonplaceholder.typicode.com/*"
],
"genericRandomErrorPlugin": {
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.27.0/genericrandomerrorplugin.schema.json",
"$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.28.0/genericrandomerrorplugin.schema.json",
"errorsFile": "devproxy-errors.json",
"rate": 50
},
Expand Down
4 changes: 2 additions & 2 deletions install-beta.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#define MyAppName "Dev Proxy Beta"
; for local use only. In production replaced by a command line arg
#define MyAppSetupExeName "dev-proxy-installer-win-x64-0.27.0-beta.1"
#define MyAppVersion "0.27.0-beta.1"
#define MyAppSetupExeName "dev-proxy-installer-win-x64-0.28.0-beta.1"
#define MyAppVersion "0.28.0-beta.1"
#define MyAppPublisher ".NET Foundation"
#define MyAppURL "https://aka.ms/devproxy"

Expand Down
4 changes: 2 additions & 2 deletions install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#define MyAppName "Dev Proxy"
; for local use only. In production replaced by a command line arg
#define MyAppSetupExeName "dev-proxy-installer-win-x64-0.27.0"
#define MyAppVersion "0.27.0"
#define MyAppSetupExeName "dev-proxy-installer-win-x64-0.28.0"
#define MyAppVersion "0.28.0"
#define MyAppPublisher ".NET Foundation"
#define MyAppURL "https://aka.ms/devproxy"

Expand Down
4 changes: 2 additions & 2 deletions schemas/v0.28.0/rc.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"client": {
"type": "string",
"enum": [
"LMStudio",
"Ollama"
"Ollama",
"OpenAI"
],
"description": "The client to use for the local language model."
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile_local
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

ARG DEVPROXY_VERSION=0.27.0-beta.1
ARG DEVPROXY_VERSION=0.28.0-beta.1
ARG USERNAME=devproxy
ENV DEVPROXY_VERSION=${DEVPROXY_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion scripts/local-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The .NET Foundation licenses this file to you under the MIT license.
# See the LICENSE file in the project root for more information.

$versionString = "v0.27.0-beta.1"
$versionString = "v0.28.0-beta.1"
$version = $versionString.Substring(1)
$isBeta = $version.Contains("-beta")

Expand Down
2 changes: 1 addition & 1 deletion scripts/version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# The .NET Foundation licenses this file to you under the MIT license.
# See the LICENSE file in the project root for more information.

$script:versionString = "v0.27.0-beta.1"
$script:versionString = "v0.28.0-beta.1"